gantt-task-react-powern 0.4.62 → 0.4.64

package/dist/components/grid/grid-body.d.ts

@@ -2,11 +2,13 @@ import React from "react";
 import { Task } from "../../types/public-types";
 export declare type GridBodyProps = {
     tasks: Task[];
+    scheduleType: string;
     dates: Date[];
     svgWidth: number;
     rowHeight: number;
     columnWidth: number;
     todayColor: string;
+    weekendColor: string;
     rtl: boolean;
 };
 export declare const GridBody: React.FC<GridBodyProps>;

package/dist/components/task-list/task-list-table.d.ts

@@ -7,6 +7,7 @@ export declare const TaskListTableDefault: React.FC<{
     fontSize: string;
     locale: string;
     tasks: Task[];
+    scheduleType: string;
     leafTasks: Task[];
     selectedTaskId: string;
     setSelectedTask: (taskId: string) => void;

package/dist/components/task-list/task-list.d.ts

@@ -12,6 +12,7 @@ export declare type TaskListProps = {
     scrollY: number;
     locale: string;
     tasks: Task[];
+    scheduleType: string;
     leafTasks: Task[];
     taskListRef: React.RefObject<HTMLDivElement>;
     horizontalContainerClass?: string;
@@ -32,6 +33,7 @@ export declare type TaskListProps = {
         fontSize: string;
         locale: string;
         tasks: Task[];
+        scheduleType: string;
         leafTasks: Task[];
         selectedTaskId: string;
         setSelectedTask: (taskId: string) => void;

package/dist/index.css

@@ -37,6 +37,23 @@
   text-overflow: ellipsis;
   white-space: nowrap;
   overflow: hidden;
+  background-color: #fff;
+}
+
+._GzvG4 {
+  display: table-row;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+  background-color: #fff;
+}
+
+._3Ykml {
+  display: table-row;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+  background-color: #e6e4e4;
 }
 
 ._34SS0:nth-of-type(even) {
@@ -49,6 +66,7 @@
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
+  border-bottom: #ebeff2 1px solid;
 }
 ._nI1Xw {
   display: flex;
@@ -152,6 +170,14 @@
   fill: #f5f5f5;
 }
 
+._2RRca {
+  fill: #fff;
+}
+
+._2RRca:nth-child(even) {
+  fill: #fff;
+}
+
 ._3rUKi {
   stroke: #ebeff2;
 }
@@ -160,7 +186,7 @@
   stroke: #e6e4e4;
 }
 ._2M-tt {
-  fill: #e6e4e4 !important; 
+  fill: #e6e4e4 !important;
 }
 
 ._9w8d5 {

package/dist/index.js

@@ -342,7 +342,7 @@ var TaskListHeaderDefault = function TaskListHeaderDefault(_ref) {
   }, "Planned End")));
 };
 
-var styles$1 = {"taskListWrapper":"_3ZbQT","taskListTableRow":"_34SS0","taskListCell":"_3lLk3","taskListNameWrapper":"_nI1Xw","taskListExpander":"_2QjE6","taskListExpanderPlaceholder":"_1fnLB","taskListEmptyExpander":"_2TfEi","taskListText":"_2ZvXU"};
+var styles$1 = {"taskListWrapper":"_3ZbQT","taskListTableRow":"_34SS0","taskListLookAheadRow":"_GzvG4","taskListMilestoneRow":"_3Ykml","taskListCell":"_3lLk3","taskListNameWrapper":"_nI1Xw","taskListExpander":"_2QjE6","taskListExpanderPlaceholder":"_1fnLB","taskListEmptyExpander":"_2TfEi","taskListText":"_2ZvXU"};
 
 var localeDateStringCache = {};
 
@@ -370,6 +370,7 @@ var TaskListTableDefault = function TaskListTableDefault(_ref) {
   var rowHeight = _ref.rowHeight,
       rowWidth = _ref.rowWidth,
       tasks = _ref.tasks,
+      scheduleType = _ref.scheduleType,
       leafTasks = _ref.leafTasks,
       fontFamily = _ref.fontFamily,
       fontSize = _ref.fontSize,
@@ -405,7 +406,7 @@ var TaskListTableDefault = function TaskListTableDefault(_ref) {
     }
 
     return React__default.createElement("div", {
-      className: styles$1.taskListTableRow,
+      className: t.type === "milestone" ? styles$1.taskListMilestoneRow : scheduleType === "lookAhead" ? styles$1.taskListLookAheadRow : styles$1.taskListTableRow,
       style: {
         height: rowHeight
       },
@@ -629,6 +630,7 @@ var TaskList = function TaskList(_ref) {
       rowHeight = _ref.rowHeight,
       scrollY = _ref.scrollY,
       tasks = _ref.tasks,
+      scheduleType = _ref.scheduleType,
       leafTasks = _ref.leafTasks,
       selectedTask = _ref.selectedTask,
       setSelectedTask = _ref.setSelectedTask,
@@ -660,6 +662,7 @@ var TaskList = function TaskList(_ref) {
     fontSize: fontSize,
     tasks: tasks,
     leafTasks: leafTasks,
+    scheduleType: scheduleType,
     locale: locale,
     selectedTaskId: selectedTaskId,
     setSelectedTask: setSelectedTask,
@@ -677,15 +680,17 @@ var TaskList = function TaskList(_ref) {
   }, React__default.createElement(TaskListTable, Object.assign({}, tableProps))));
 };
 
-var styles$4 = {"gridRow":"_2dZTy","gridRowLine":"_3rUKi","gridTick":"_RuwuK","darkerGridRow":"_2M-tt"};
+var styles$4 = {"gridRow":"_2dZTy","gridRowLookAhead":"_2RRca","gridRowLine":"_3rUKi","gridTick":"_RuwuK","darkerGridRow":"_2M-tt"};
 
 var GridBody = function GridBody(_ref) {
   var tasks = _ref.tasks,
+      scheduleType = _ref.scheduleType,
       dates = _ref.dates,
       rowHeight = _ref.rowHeight,
       svgWidth = _ref.svgWidth,
       columnWidth = _ref.columnWidth,
       todayColor = _ref.todayColor,
+      weekendColor = _ref.weekendColor,
       rtl = _ref.rtl;
   var y = 0;
   var gridRows = [];
@@ -707,7 +712,7 @@ var GridBody = function GridBody(_ref) {
       y: y,
       width: svgWidth,
       height: rowHeight,
-      className: isDarkerRow ? styles$4.darkerGridRow : styles$4.gridRow
+      className: isDarkerRow ? styles$4.darkerGridRow : scheduleType === "lookAhead" ? styles$4.gridRowLookAhead : styles$4.gridRow
     }));
     rowLines.push(React__default.createElement("line", {
       key: "RowLine" + task.id,
@@ -724,6 +729,7 @@ var GridBody = function GridBody(_ref) {
   var tickX = 0;
   var ticks = [];
   var today = React__default.createElement("rect", null);
+  var weekend = [];
 
   for (var i = 0; i < dates.length; i++) {
     var date = dates[i];
@@ -746,6 +752,16 @@ var GridBody = function GridBody(_ref) {
       });
     }
 
+    if (date.getDay() === 6 || date.getDay() === 0) {
+      weekend.push(React__default.createElement("rect", {
+        x: tickX,
+        y: 0,
+        width: columnWidth,
+        height: y,
+        fill: weekendColor
+      }));
+    }
+
     if (rtl && i + 1 !== dates.length && date.getTime() >= now.getTime() && dates[i + 1].getTime() < now.getTime()) {
       today = React__default.createElement("rect", {
         x: tickX + columnWidth,
@@ -767,7 +783,9 @@ var GridBody = function GridBody(_ref) {
     className: "rowLines"
   }, rowLines), React__default.createElement("g", {
     className: "ticks"
-  }, ticks), React__default.createElement("g", {
+  }, ticks), scheduleType === "lookAhead" && React__default.createElement("g", {
+    className: "weekend"
+  }, weekend), React__default.createElement("g", {
     className: "today"
   }, today));
 };
@@ -1798,7 +1816,7 @@ var Bar = function Bar(_ref) {
   var handleHeight = task.height / 2 - 1;
 
   if (type == "planned") {
-    if (task.x1 && task.x2) 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, {
@@ -1846,7 +1864,7 @@ var Bar = function Bar(_ref) {
       className: styles$6.barWrapper,
       tabIndex: 0
     });
-  } else if (task.actualx1 && task.actualx2) {
+  } 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
@@ -2033,11 +2051,11 @@ var TaskItem = function TaskItem(props) {
   React.useEffect(function () {
     switch (task.typeInternal) {
       case "milestone":
-        setTaskItem([React__default.createElement(Milestone, Object.assign({}, props))]);
+        if (task.x1 >= 0 && task.actualx1 >= 0) setTaskItem([React__default.createElement(Milestone, Object.assign({}, props))]);else setTaskItem([]);
         break;
 
       case "project":
-        setTaskItem([React__default.createElement(Project, Object.assign({}, props))]);
+        if ((task === null || task === void 0 ? void 0 : task.x1) >= 0 && (task === null || task === void 0 ? void 0 : task.x2) >= 0 && task.x2 > task.x1 && (task === null || task === void 0 ? void 0 : task.actualx1) >= 0 && (task === null || task === void 0 ? void 0 : task.actualx2) >= 0 && task.actualx2 > task.actualx1) setTaskItem([React__default.createElement(Project, Object.assign({}, props))]);else setTaskItem([]);
         break;
 
       case "smalltask":
@@ -2048,13 +2066,13 @@ var TaskItem = function TaskItem(props) {
         {
           var _taskItem = [];
 
-          if (task.x1 && task.x2) {
+          if ((task === null || task === void 0 ? void 0 : task.x1) >= 0 && (task === null || task === void 0 ? void 0 : task.x2) >= 0) {
             _taskItem.push(React__default.createElement(Bar, Object.assign({}, props, {
               type: "planned"
             })));
           }
 
-          if (task.actualx1 && task.actualx2) {
+          if ((task === null || task === void 0 ? void 0 : task.actualx1) >= 0 && (task === null || task === void 0 ? void 0 : task.actualx2) >= 0) {
             _taskItem.push(React__default.createElement(Bar, Object.assign({}, props, {
               type: "actual"
             })));
@@ -2365,7 +2383,7 @@ var TaskGanttContent = function TaskGanttContent(_ref) {
     return task.barChildren.map(function (child) {
       var _task$criticalPathArr, _task$criticalPathArr2;
 
-      return React__default.createElement(Arrow, {
+      if (task.x2 > task.x1 || task.actualx2 > task.actualx1) return React__default.createElement(Arrow, {
         key: "Arrow from " + task.id + " to " + tasks[child.index].id,
         taskFrom: task,
         taskTo: tasks[child.index],
@@ -2376,6 +2394,11 @@ var TaskGanttContent = function TaskGanttContent(_ref) {
         arrowColor: ((_task$criticalPathArr = task.criticalPathArrows) === null || _task$criticalPathArr === void 0 ? void 0 : (_task$criticalPathArr2 = _task$criticalPathArr.find(function (arrow) {
           return arrow.taskId == tasks[child.index].id;
         })) === null || _task$criticalPathArr2 === void 0 ? void 0 : _task$criticalPathArr2.arrowColor) || "#808080"
+      });else return React__default.createElement("g", {
+        key: _task.id,
+        style: {
+          height: taskHeight
+        }
       });
     });
   })), React__default.createElement("g", {
@@ -2497,6 +2520,12 @@ var Gantt = function Gantt(_ref) {
   var tasks = _ref.tasks,
       _ref$leafTasks = _ref.leafTasks,
       leafTasks = _ref$leafTasks === void 0 ? [] : _ref$leafTasks,
+      _ref$scheduleType = _ref.scheduleType,
+      scheduleType = _ref$scheduleType === void 0 ? "main" : _ref$scheduleType,
+      _ref$startDate = _ref.startDate,
+      startDate = _ref$startDate === void 0 ? new Date() : _ref$startDate,
+      _ref$endDate = _ref.endDate,
+      endDate = _ref$endDate === void 0 ? new Date() : _ref$endDate,
       _ref$headerHeight = _ref.headerHeight,
       headerHeight = _ref$headerHeight === void 0 ? 50 : _ref$headerHeight,
       _ref$columnWidth = _ref.columnWidth,
@@ -2553,6 +2582,8 @@ var Gantt = function Gantt(_ref) {
       arrowIndent = _ref$arrowIndent === void 0 ? 20 : _ref$arrowIndent,
       _ref$todayColor = _ref.todayColor,
       todayColor = _ref$todayColor === void 0 ? "rgba(252, 248, 227, 0.5)" : _ref$todayColor,
+      _ref$weekendColor = _ref.weekendColor,
+      weekendColor = _ref$weekendColor === void 0 ? "#f5f5f5" : _ref$weekendColor,
       viewDate = _ref.viewDate,
       _ref$TooltipContent = _ref.TooltipContent,
       TooltipContent = _ref$TooltipContent === void 0 ? StandardTooltipContent : _ref$TooltipContent,
@@ -2573,12 +2604,19 @@ var Gantt = function Gantt(_ref) {
 
   var _useState = React.useState(function () {
     var _ganttDateRange = ganttDateRange(tasks, viewMode, preStepsCount),
-        startDate = _ganttDateRange[0],
-        endDate = _ganttDateRange[1];
+        startDateRange = _ganttDateRange[0],
+        endDateRange = _ganttDateRange[1];
+
+    if (scheduleType === "lookAhead") {
+      return {
+        viewMode: viewMode,
+        dates: seedDates(startDate, endDate, viewMode)
+      };
+    }
 
     return {
       viewMode: viewMode,
-      dates: seedDates(startDate, endDate, viewMode)
+      dates: seedDates(startDateRange, endDateRange, viewMode)
     };
   }),
       dateSetup = _useState[0],
@@ -2637,6 +2675,14 @@ var Gantt = function Gantt(_ref) {
       ignoreScrollEvent = _useState12[0],
       setIgnoreScrollEvent = _useState12[1];
 
+  React.useEffect(function () {
+    if (scheduleType === "lookAhead" && startDate && endDate) {
+      setDateSetup({
+        viewMode: viewMode,
+        dates: seedDates(startDate, endDate, viewMode)
+      });
+    }
+  }, [startDate, endDate]);
   React.useEffect(function () {
     var filteredTasks;
 
@@ -2649,10 +2695,14 @@ var Gantt = function Gantt(_ref) {
     filteredTasks = filteredTasks.sort(sortTasks);
 
     var _ganttDateRange2 = ganttDateRange(filteredTasks, viewMode, preStepsCount),
-        startDate = _ganttDateRange2[0],
-        endDate = _ganttDateRange2[1];
+        startDateRange = _ganttDateRange2[0],
+        endDateRange = _ganttDateRange2[1];
 
-    var newDates = seedDates(startDate, endDate, viewMode);
+    var newDates = seedDates(startDateRange, endDateRange, viewMode);
+
+    if (scheduleType === "lookAhead") {
+      newDates = seedDates(startDate, endDate, viewMode);
+    }
 
     if (rtl) {
       newDates = newDates.reverse();
@@ -2662,10 +2712,12 @@ var Gantt = function Gantt(_ref) {
       }
     }
 
-    setDateSetup({
-      dates: newDates,
-      viewMode: viewMode
-    });
+    if (scheduleType !== "lookAhead") {
+      setDateSetup({
+        dates: seedDates(startDateRange, endDateRange, viewMode),
+        viewMode: viewMode
+      });
+    }
 
     var _getCriticalPaths = getCriticalPaths(leafTasks),
         primaryPath = _getCriticalPaths[0],
@@ -2892,9 +2944,11 @@ var Gantt = function Gantt(_ref) {
     columnWidth: columnWidth,
     svgWidth: svgWidth,
     tasks: tasks,
+    scheduleType: scheduleType,
     rowHeight: rowHeight,
     dates: dateSetup.dates,
     todayColor: todayColor,
+    weekendColor: weekendColor,
     rtl: rtl
   };
   var calendarProps = {
@@ -2938,6 +2992,7 @@ var Gantt = function Gantt(_ref) {
     fontSize: fontSize,
     tasks: barTasks,
     leafTasks: leafTasks,
+    scheduleType: scheduleType,
     locale: locale,
     headerHeight: headerHeight,
     scrollY: scrollY,