gantt-task-react-powern 0.4.96 → 0.4.97

package/dist/components/gantt/gantt.d.ts

@@ -6,3 +6,4 @@ export declare function getCriticalPaths(leafTasks: Task[]): any[][];
 export declare function computeCriticalPath(taskID: string, taskMap: {}): void;
 export declare function uncolorAll(tasks: Task[]): void;
 export declare function colorPath(path: Task[], color: string, tasks: Task[], criticalPathType: string): void;
+export declare const getParentWbs: (wbs: string) => string | undefined;

package/dist/index.js

@@ -433,6 +433,18 @@ var TaskListTableDefault = function TaskListTableDefault(_ref) {
       return t.id;
     }));
   }, [leafTasks]);
+
+  var hasSelectedAncestor = function hasSelectedAncestor(taskId, selectedSet, allTasks) {
+    var task = allTasks.find(function (t) {
+      return t.id === taskId;
+    });
+    if (!task) return false;
+    var parentWbs = getParentWbs(task.id);
+    if (!parentWbs) return false;
+    if (selectedSet.has(parentWbs)) return true;
+    return hasSelectedAncestor(parentWbs, selectedSet, allTasks);
+  };
+
   return React__default.createElement("div", {
     className: styles$1.taskListWrapper,
     style: {
@@ -451,6 +463,7 @@ var TaskListTableDefault = function TaskListTableDefault(_ref) {
     }
 
     var isSelected = selectedTasks.includes(t.id);
+    var isAncestorSelected = hasSelectedAncestor(t.id, new Set(selectedTasks), tasks);
     return React__default.createElement("div", {
       className: t.type === "milestone" ? styles$1.taskListMilestoneRow : scheduleType === "lookAhead" ? styles$1.taskListLookAheadRow : styles$1.taskListTableRow,
       style: {
@@ -476,6 +489,7 @@ var TaskListTableDefault = function TaskListTableDefault(_ref) {
     }, React__default.createElement("input", {
       type: "checkbox",
       checked: isSelected,
+      disabled: isAncestorSelected,
       onChange: function onChange(e) {
         return onTaskSelect(t.id, e.target.checked);
       }
@@ -756,15 +770,54 @@ var TaskList = function TaskList(_ref) {
     }
   }, [selectedTasks, tasks, onMultiSelect]);
 
+  var getDescendants = function getDescendants(taskId, allTasks) {
+    var task = allTasks.find(function (t) {
+      return t.id === taskId;
+    });
+    if (!task) return [];
+    var children = allTasks.filter(function (t) {
+      return getParentWbs(t.id) === taskId;
+    });
+    return children.flatMap(function (child) {
+      return [child.id].concat(getDescendants(child.id, allTasks));
+    });
+  };
+
+  var recursiveOpen = function recursiveOpen(taskId, allTasks) {
+    var task = allTasks.find(function (t) {
+      return t.id === taskId;
+    });
+    if (!task) return;
+
+    if (task.hideChildren === true) {
+      onExpanderClick(task);
+    }
+
+    var children = allTasks.filter(function (t) {
+      return getParentWbs(t.id) === taskId;
+    });
+    children.forEach(function (c) {
+      return recursiveOpen(c.id, allTasks);
+    });
+  };
+
   var handleTaskSelect = function handleTaskSelect(taskId, selected) {
+    var descendants = getDescendants(taskId, tasks);
+
     if (selected) {
       setSelectedTasks(function (prev) {
-        return [].concat(prev, [taskId]);
+        var newSelected = new Set(prev);
+        newSelected.add(taskId);
+        descendants.forEach(function (d) {
+          return newSelected.add(d);
+        });
+        return Array.from(newSelected);
       });
+      recursiveOpen(taskId, tasks);
     } else {
       setSelectedTasks(function (prev) {
         return prev.filter(function (id) {
-          return id !== taskId;
+          return id !== taskId && !descendants.includes(id);
         });
       });
     }
@@ -772,9 +825,19 @@ var TaskList = function TaskList(_ref) {
 
   var handleSelectAll = function handleSelectAll(selected) {
     if (selected) {
-      setSelectedTasks(tasks.map(function (task) {
-        return task.id;
-      }));
+      var topLevelTasks = tasks.filter(function (task) {
+        return !getParentWbs(task.id);
+      });
+      var newSelected = new Set();
+      topLevelTasks.forEach(function (task) {
+        newSelected.add(task.id);
+        var descendants = getDescendants(task.id, tasks);
+        descendants.forEach(function (d) {
+          return newSelected.add(d);
+        });
+        recursiveOpen(task.id, tasks);
+      });
+      setSelectedTasks(Array.from(newSelected));
     } else {
       setSelectedTasks([]);
     }
@@ -2020,7 +2083,7 @@ var Bar = function Bar(_ref) {
   var handleHeight = task.height / 2 - 1;
 
   if (type == "planned") {
-    if ((task === null || task === void 0 ? void 0 : task.x1) >= 0 && (task === null || task === void 0 ? void 0 : task.x2) > 0) return React__default.createElement("g", {
+    if ((task === null || task === void 0 ? void 0 : task.x1) >= 0 && (task === null || task === void 0 ? void 0 : task.x2) >= 0) return React__default.createElement("g", {
       className: styles$6.barWrapper,
       tabIndex: 0
     }, React__default.createElement(BarDisplay, {
@@ -2068,7 +2131,7 @@ var Bar = function Bar(_ref) {
       className: styles$6.barWrapper,
       tabIndex: 0
     });
-  } else if ((task === null || task === void 0 ? void 0 : task.actualx1) >= 0 && (task === null || task === void 0 ? void 0 : task.actualx2) > 0) {
+  } else if ((task === null || task === void 0 ? void 0 : task.actualx1) >= 0 && (task === null || task === void 0 ? void 0 : task.actualx2) >= 0) {
     return React__default.createElement("g", {
       className: styles$6.barWrapper,
       tabIndex: 0
@@ -3394,7 +3457,6 @@ function getCriticalPaths(leafTasks) {
     primaryLeaf = taskMap[primaryLeaf].next;
   }
 
-  console.debug(taskMap);
   var secondaryLeaf;
   var secondaryDuration = 0;
 
@@ -3421,54 +3483,14 @@ function getCriticalPaths(leafTasks) {
 function computeCriticalPath(taskID, taskMap) {
   var task = taskMap[taskID].task;
   var dependents = taskMap[taskID].dependents;
-  taskMap[taskID].start = task.start.getTime();
   taskMap[taskID].end = task.end.getTime();
-  var start = taskMap[taskID].start;
-
-  for (var _iterator = _createForOfIteratorHelperLoose(dependents), _step; !(_step = _iterator()).done;) {
-    var _dependentTask$depend;
 
-    var depID = _step.value;
-    var dependentTask = taskMap[depID].task;
-    var dependency = (_dependentTask$depend = dependentTask.dependencies) === null || _dependentTask$depend === void 0 ? void 0 : _dependentTask$depend.find(function (d) {
-      return d.id === taskID;
-    });
-    console.debug(dependency);
-    if (!dependency) continue;
-
-    switch (dependency.type) {
-      case "FS":
-        if (taskMap[depID].end > taskMap[taskID].end) {
-          taskMap[taskID].next = depID;
-          taskMap[taskID].end = taskMap[depID].end;
-        }
-
-        break;
-
-      case "SS":
-        if (taskMap[depID].start > start) {
-          taskMap[taskID].next = depID;
-          start = taskMap[depID].start;
-          taskMap[taskID].end = taskMap[depID].end;
-        }
+  for (var j = 0; j < dependents.length; j++) {
+    var newDependentEnd = taskMap[dependents[j]].end;
 
-        break;
-
-      case "FF":
-        if (taskMap[depID].end > taskMap[taskID].end) {
-          taskMap[taskID].next = depID;
-          taskMap[taskID].end = taskMap[depID].end;
-        }
-
-        break;
-
-      case "SF":
-        if (taskMap[depID].start > taskMap[taskID].end) {
-          taskMap[taskID].next = depID;
-          taskMap[taskID].end = taskMap[depID].start;
-        }
-
-        break;
+    if (newDependentEnd > taskMap[taskID].end) {
+      taskMap[taskID].next = dependents[j];
+      taskMap[taskID].end = newDependentEnd;
     }
   }
 }
@@ -3539,6 +3561,11 @@ function colorPath(path, color, tasks, criticalPathType) {
     _loop(_i7);
   }
 }
+var getParentWbs = function getParentWbs(wbs) {
+  var segments = wbs.split('.');
+  if (segments.length <= 1) return undefined;
+  return segments.slice(0, -1).join('.');
+};
 
 exports.Gantt = Gantt;
 exports.getCriticalPaths = getCriticalPaths;