gantt-task-react-v 1.1.2 → 1.1.4

package/dist/gantt-task-react.umd.js

@@ -10038,10 +10038,10 @@
       const { id, comparisonLevel = 1 } = task;
       const onRootMouseDown = React.useCallback(
         (event) => {
-          event.preventDefault();
           if (event.button !== 0) {
             return;
           }
+          event.preventDefault();
           if (task.type !== "empty") {
             scrollToTask(task);
           }
@@ -10924,204 +10924,6 @@
     ganttToday,
     ganttTodayCircle
   };
-  const getDateByOffset = (startDate, offset2, viewMode) => {
-    switch (viewMode) {
-      case ViewMode.Day:
-        return addDays(startDate, offset2);
-      case ViewMode.HalfDay:
-        return addHours(startDate, offset2 * 12);
-      case ViewMode.QuarterDay:
-        return addHours(startDate, offset2 * 6);
-      case ViewMode.Hour:
-        return addHours(startDate, offset2);
-      case ViewMode.Month:
-        return addMonths(startDate, offset2);
-      case ViewMode.Week:
-        return addWeeks(startDate, offset2);
-      case ViewMode.Year:
-        return addYears(startDate, offset2);
-      default:
-        throw new Error("Unknown view mode");
-    }
-  };
-  const taskXCoordinate = (xDate, startDate, viewMode, columnWidth) => {
-    const index2 = getDatesDiff(xDate, startDate, viewMode);
-    const currentDate = getDateByOffset(startDate, index2, viewMode);
-    const nextDate = getDateByOffset(startDate, index2 + 1, viewMode);
-    const remainderMillis = xDate.getTime() - currentDate.getTime();
-    const percentOfInterval = remainderMillis / (nextDate.getTime() - currentDate.getTime());
-    return index2 * columnWidth + percentOfInterval * columnWidth;
-  };
-  const taskComparisonXCoordinate = (xDate, startDate, viewMode, columnWidth) => {
-    const index2 = getDatesDiff(xDate, startDate, viewMode);
-    const currentDate = getDateByOffset(startDate, index2, viewMode);
-    const nextDate = getDateByOffset(startDate, index2 + 1, viewMode);
-    const remainderMillis = xDate.getTime() - currentDate.getTime();
-    const percentOfInterval = remainderMillis / (nextDate.getTime() - currentDate.getTime());
-    return index2 * columnWidth + percentOfInterval * columnWidth;
-  };
-  const progressWithByParams = (taskX1, taskX2, progress, rtl) => {
-    const progressWidth = Math.max((taskX2 - taskX1) * progress * 0.01, 0);
-    let progressX;
-    if (rtl) {
-      progressX = taskX2 - progressWidth;
-    } else {
-      progressX = taskX1;
-    }
-    return [progressWidth, progressX];
-  };
-  const dateByX = (x, taskX, taskDate, xStep, timeStep) => {
-    let newDate = new Date((x - taskX) / xStep * timeStep + taskDate.getTime());
-    newDate = new Date(
-      newDate.getTime() + (newDate.getTimezoneOffset() - taskDate.getTimezoneOffset()) * 6e4
-    );
-    return newDate;
-  };
-  const handleTaskBySVGMouseEvent = (action, selectedTask, initialCoordinates, coordinates, xStep, timeStep, rtl) => {
-    let result;
-    switch (selectedTask.type) {
-      case "milestone":
-        result = handleTaskBySVGMouseEventForMilestone(
-          action,
-          selectedTask,
-          initialCoordinates,
-          coordinates,
-          xStep,
-          timeStep
-        );
-        break;
-      default:
-        result = handleTaskBySVGMouseEventForBar(
-          action,
-          selectedTask,
-          initialCoordinates,
-          coordinates,
-          xStep,
-          timeStep,
-          rtl
-        );
-        break;
-    }
-    return result;
-  };
-  const handleTaskBySVGMouseEventForBar = (action, selectedTask, initialCoordinates, coordinates, xStep, timeStep, rtl) => {
-    const changedTask = { ...selectedTask };
-    let isChanged = false;
-    switch (action) {
-      case "progress":
-        isChanged = initialCoordinates.progressWidth !== coordinates.progressWidth;
-        if (isChanged) {
-          changedTask.progress = Math.round(
-            coordinates.progressWidth * 100 / (coordinates.x2 - coordinates.x1)
-          );
-        }
-        break;
-      case "start": {
-        isChanged = initialCoordinates.x1 !== coordinates.x1;
-        if (isChanged) {
-          if (rtl) {
-            changedTask.end = dateByX(
-              coordinates.x1,
-              initialCoordinates.x1,
-              selectedTask.end,
-              xStep,
-              timeStep
-            );
-          } else {
-            changedTask.start = dateByX(
-              coordinates.x1,
-              initialCoordinates.x1,
-              selectedTask.start,
-              xStep,
-              timeStep
-            );
-          }
-        }
-        break;
-      }
-      case "end": {
-        isChanged = initialCoordinates.x2 !== coordinates.x2;
-        if (isChanged) {
-          if (rtl) {
-            changedTask.start = dateByX(
-              coordinates.x2,
-              initialCoordinates.x2,
-              selectedTask.start,
-              xStep,
-              timeStep
-            );
-          } else {
-            changedTask.end = dateByX(
-              coordinates.x2,
-              initialCoordinates.x2,
-              selectedTask.end,
-              xStep,
-              timeStep
-            );
-          }
-        }
-        break;
-      }
-      case "move": {
-        isChanged = initialCoordinates.x1 !== coordinates.x1;
-        if (isChanged) {
-          if (rtl) {
-            changedTask.end = dateByX(
-              coordinates.x1,
-              initialCoordinates.x1,
-              selectedTask.end,
-              xStep,
-              timeStep
-            );
-            changedTask.start = dateByX(
-              coordinates.x2,
-              initialCoordinates.x2,
-              selectedTask.start,
-              xStep,
-              timeStep
-            );
-          } else {
-            changedTask.start = dateByX(
-              coordinates.x1,
-              initialCoordinates.x1,
-              selectedTask.start,
-              xStep,
-              timeStep
-            );
-            changedTask.end = dateByX(
-              coordinates.x2,
-              initialCoordinates.x2,
-              selectedTask.end,
-              xStep,
-              timeStep
-            );
-          }
-        }
-        break;
-      }
-    }
-    return { isChanged, changedTask };
-  };
-  const handleTaskBySVGMouseEventForMilestone = (action, selectedTask, initialCoordinates, coordinates, xStep, timeStep) => {
-    const changedTask = { ...selectedTask };
-    const isChanged = coordinates.x1 !== initialCoordinates.x1;
-    if (isChanged) {
-      switch (action) {
-        case "move": {
-          changedTask.start = dateByX(
-            coordinates.x1,
-            initialCoordinates.x1,
-            selectedTask.start,
-            xStep,
-            timeStep
-          );
-          changedTask.end = changedTask.start;
-          break;
-        }
-      }
-    }
-    return { isChanged, changedTask };
-  };
   const GanttTodayInner = ({
     additionalLeftSpace,
     distances: { columnWidth },
@@ -11130,8 +10932,6 @@
     rtl,
     startDate,
     viewMode,
-    taskHeight,
-    // Add taskHeight parameter
     showTodayLine = true,
     showDataDateLine = false,
     dataDate = null,
@@ -11145,14 +10945,38 @@
         return null;
       }
       const today = /* @__PURE__ */ new Date();
-      const x = taskXCoordinate(today, startDate, viewMode, columnWidth);
-      const adjustedX = rtl ? x + columnWidth : x;
+      const todayIndex = getDatesDiff(today, startDate, viewMode);
+      const extraMultiplier = () => {
+        switch (viewMode) {
+          case ViewMode.Week: {
+            const percent = today.getDay() / 7;
+            return 1 + percent * 0.2;
+          }
+          case ViewMode.Month: {
+            const dayInMonth = today.getDate();
+            const maxDaysInMonth = getDaysInMonth(
+              today.getMonth(),
+              today.getFullYear()
+            );
+            const percent = dayInMonth / maxDaysInMonth;
+            return 1 + percent * 0.5;
+          }
+          case ViewMode.Year: {
+            const percent = today.getMonth() / 12;
+            return 1 + percent * 0.5;
+          }
+          default:
+            return 1;
+        }
+      };
+      const tickX = todayIndex * columnWidth * extraMultiplier();
+      const x = rtl ? tickX + columnWidth : tickX;
       const color = todayColor || "var(--gantt-calendar-today-color)";
       return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
         /* @__PURE__ */ jsxRuntime.jsx(
           "rect",
           {
-            x: additionalLeftSpace + adjustedX,
+            x: additionalLeftSpace + x,
             y: 0,
             width: 2,
             height: ganttFullHeight,
@@ -11163,7 +10987,7 @@
           "circle",
           {
             className: styles$c.ganttTodayCircle,
-            cx: adjustedX + 1,
+            cx: x + 1,
             cy: 6,
             r: 6,
             fill: color
@@ -11172,7 +10996,7 @@
         /* @__PURE__ */ jsxRuntime.jsx(
           "text",
           {
-            x: additionalLeftSpace + adjustedX + 8,
+            x: additionalLeftSpace + x + 8,
             y: 10,
             fill: color,
             fontSize: 12,
@@ -11197,16 +11021,38 @@
       if (!showDataDateLine || !dataDate) {
         return null;
       }
-      const index2 = getDatesDiff(dataDate, startDate, viewMode);
-      const intervalEndX = (index2 + 1) * columnWidth;
-      const milestoneEndX = intervalEndX + taskHeight * 0.5;
-      const adjustedX = rtl ? milestoneEndX + columnWidth : milestoneEndX;
+      const dataIndex = getDatesDiff(dataDate, startDate, viewMode);
+      const extraMultiplier = () => {
+        switch (viewMode) {
+          case ViewMode.Week: {
+            const percent = dataDate.getDay() / 7;
+            return 1 + percent * 0.2;
+          }
+          case ViewMode.Month: {
+            const dayInMonth = dataDate.getDate();
+            const maxDaysInMonth = getDaysInMonth(
+              dataDate.getMonth(),
+              dataDate.getFullYear()
+            );
+            const percent = dayInMonth / maxDaysInMonth;
+            return 1 + percent * 0.5;
+          }
+          case ViewMode.Year: {
+            const percent = dataDate.getMonth() / 12;
+            return 1 + percent * 0.5;
+          }
+          default:
+            return 1;
+        }
+      };
+      const tickX = dataIndex * columnWidth * extraMultiplier();
+      const x = rtl ? tickX + columnWidth : tickX;
       const color = dataDateColor || "var(--gantt-calendar-today-color)";
       return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
         /* @__PURE__ */ jsxRuntime.jsx(
           "rect",
           {
-            x: additionalLeftSpace + adjustedX,
+            x: additionalLeftSpace + x,
             y: 0,
             width: 2,
             height: ganttFullHeight,
@@ -11218,7 +11064,7 @@
           "circle",
           {
             className: styles$c.ganttTodayCircle,
-            cx: adjustedX + 1,
+            cx: x + 1,
             cy: 6,
             r: 6,
             fill: color
@@ -11227,7 +11073,7 @@
         /* @__PURE__ */ jsxRuntime.jsx(
           "text",
           {
-            x: additionalLeftSpace + adjustedX + 8,
+            x: additionalLeftSpace + x + 8,
             y: 10,
             fill: color,
             fontSize: 12,
@@ -11243,7 +11089,6 @@
       rtl,
       startDate,
       viewMode,
-      taskHeight,
       showDataDateLine,
       dataDate,
       dataDateColor,
@@ -11942,6 +11787,204 @@
       }
     );
   };
+  const getDateByOffset = (startDate, offset2, viewMode) => {
+    switch (viewMode) {
+      case ViewMode.Day:
+        return addDays(startDate, offset2);
+      case ViewMode.HalfDay:
+        return addHours(startDate, offset2 * 12);
+      case ViewMode.QuarterDay:
+        return addHours(startDate, offset2 * 6);
+      case ViewMode.Hour:
+        return addHours(startDate, offset2);
+      case ViewMode.Month:
+        return addMonths(startDate, offset2);
+      case ViewMode.Week:
+        return addWeeks(startDate, offset2);
+      case ViewMode.Year:
+        return addYears(startDate, offset2);
+      default:
+        throw new Error("Unknown view mode");
+    }
+  };
+  const taskXCoordinate = (xDate, startDate, viewMode, columnWidth) => {
+    const index2 = getDatesDiff(xDate, startDate, viewMode);
+    const currentDate = getDateByOffset(startDate, index2, viewMode);
+    const nextDate = getDateByOffset(startDate, index2 + 1, viewMode);
+    const remainderMillis = xDate.getTime() - currentDate.getTime();
+    const percentOfInterval = remainderMillis / (nextDate.getTime() - currentDate.getTime());
+    return index2 * columnWidth + percentOfInterval * columnWidth;
+  };
+  const taskComparisonXCoordinate = (xDate, startDate, viewMode, columnWidth) => {
+    const index2 = getDatesDiff(xDate, startDate, viewMode);
+    const currentDate = getDateByOffset(startDate, index2, viewMode);
+    const nextDate = getDateByOffset(startDate, index2 + 1, viewMode);
+    const remainderMillis = xDate.getTime() - currentDate.getTime();
+    const percentOfInterval = remainderMillis / (nextDate.getTime() - currentDate.getTime());
+    return index2 * columnWidth + percentOfInterval * columnWidth;
+  };
+  const progressWithByParams = (taskX1, taskX2, progress, rtl) => {
+    const progressWidth = Math.max((taskX2 - taskX1) * progress * 0.01, 0);
+    let progressX;
+    if (rtl) {
+      progressX = taskX2 - progressWidth;
+    } else {
+      progressX = taskX1;
+    }
+    return [progressWidth, progressX];
+  };
+  const dateByX = (x, taskX, taskDate, xStep, timeStep) => {
+    let newDate = new Date((x - taskX) / xStep * timeStep + taskDate.getTime());
+    newDate = new Date(
+      newDate.getTime() + (newDate.getTimezoneOffset() - taskDate.getTimezoneOffset()) * 6e4
+    );
+    return newDate;
+  };
+  const handleTaskBySVGMouseEvent = (action, selectedTask, initialCoordinates, coordinates, xStep, timeStep, rtl) => {
+    let result;
+    switch (selectedTask.type) {
+      case "milestone":
+        result = handleTaskBySVGMouseEventForMilestone(
+          action,
+          selectedTask,
+          initialCoordinates,
+          coordinates,
+          xStep,
+          timeStep
+        );
+        break;
+      default:
+        result = handleTaskBySVGMouseEventForBar(
+          action,
+          selectedTask,
+          initialCoordinates,
+          coordinates,
+          xStep,
+          timeStep,
+          rtl
+        );
+        break;
+    }
+    return result;
+  };
+  const handleTaskBySVGMouseEventForBar = (action, selectedTask, initialCoordinates, coordinates, xStep, timeStep, rtl) => {
+    const changedTask = { ...selectedTask };
+    let isChanged = false;
+    switch (action) {
+      case "progress":
+        isChanged = initialCoordinates.progressWidth !== coordinates.progressWidth;
+        if (isChanged) {
+          changedTask.progress = Math.round(
+            coordinates.progressWidth * 100 / (coordinates.x2 - coordinates.x1)
+          );
+        }
+        break;
+      case "start": {
+        isChanged = initialCoordinates.x1 !== coordinates.x1;
+        if (isChanged) {
+          if (rtl) {
+            changedTask.end = dateByX(
+              coordinates.x1,
+              initialCoordinates.x1,
+              selectedTask.end,
+              xStep,
+              timeStep
+            );
+          } else {
+            changedTask.start = dateByX(
+              coordinates.x1,
+              initialCoordinates.x1,
+              selectedTask.start,
+              xStep,
+              timeStep
+            );
+          }
+        }
+        break;
+      }
+      case "end": {
+        isChanged = initialCoordinates.x2 !== coordinates.x2;
+        if (isChanged) {
+          if (rtl) {
+            changedTask.start = dateByX(
+              coordinates.x2,
+              initialCoordinates.x2,
+              selectedTask.start,
+              xStep,
+              timeStep
+            );
+          } else {
+            changedTask.end = dateByX(
+              coordinates.x2,
+              initialCoordinates.x2,
+              selectedTask.end,
+              xStep,
+              timeStep
+            );
+          }
+        }
+        break;
+      }
+      case "move": {
+        isChanged = initialCoordinates.x1 !== coordinates.x1;
+        if (isChanged) {
+          if (rtl) {
+            changedTask.end = dateByX(
+              coordinates.x1,
+              initialCoordinates.x1,
+              selectedTask.end,
+              xStep,
+              timeStep
+            );
+            changedTask.start = dateByX(
+              coordinates.x2,
+              initialCoordinates.x2,
+              selectedTask.start,
+              xStep,
+              timeStep
+            );
+          } else {
+            changedTask.start = dateByX(
+              coordinates.x1,
+              initialCoordinates.x1,
+              selectedTask.start,
+              xStep,
+              timeStep
+            );
+            changedTask.end = dateByX(
+              coordinates.x2,
+              initialCoordinates.x2,
+              selectedTask.end,
+              xStep,
+              timeStep
+            );
+          }
+        }
+        break;
+      }
+    }
+    return { isChanged, changedTask };
+  };
+  const handleTaskBySVGMouseEventForMilestone = (action, selectedTask, initialCoordinates, coordinates, xStep, timeStep) => {
+    const changedTask = { ...selectedTask };
+    const isChanged = coordinates.x1 !== initialCoordinates.x1;
+    if (isChanged) {
+      switch (action) {
+        case "move": {
+          changedTask.start = dateByX(
+            coordinates.x1,
+            initialCoordinates.x1,
+            selectedTask.start,
+            xStep,
+            timeStep
+          );
+          changedTask.end = changedTask.start;
+          break;
+        }
+      }
+    }
+    return { isChanged, changedTask };
+  };
   const barWrapper = "_barWrapper_5jhkr_1";
   const barHandle = "_barHandle_5jhkr_11";
   const barHandleImportantVisible = "_barHandleImportantVisible_5jhkr_37";
@@ -12757,6 +12800,9 @@
     ]);
     const onMouseDown = React.useCallback(
       (event) => {
+        if (event.button !== 0) {
+          return;
+        }
         event.stopPropagation();
         onSelectTaskOnMouseDown(task.id, event);
       },
@@ -13298,7 +13344,9 @@
       isDateChangeable,
       isRelationChangeable,
       visibleTasksMirror,
-      onArrowDoubleClick
+      onArrowDoubleClick,
+      showProgress,
+      progressColor
     ]);
     return /* @__PURE__ */ jsxRuntime.jsxs("g", { className: "content", children: [
       renderedSelectedTasks,
@@ -13360,7 +13408,8 @@
       horizontalContainerRef,
       onVerticalScrollbarScrollX,
       verticalGanttContainerRef,
-      verticalScrollbarRef
+      verticalScrollbarRef,
+      onOpenGanttContextMenu
     } = props;
     const contentRef = React.useRef(null);
     const moveStateVertRef = React.useRef(null);
@@ -13498,6 +13547,12 @@
                   height: ganttFullHeight,
                   fontFamily: "var(--gantt-font-family)",
                   ref: ganttSVGRef,
+                  onContextMenu: (event) => {
+                    event.preventDefault();
+                    if (onOpenGanttContextMenu) {
+                      onOpenGanttContextMenu(event.clientX, event.clientY);
+                    }
+                  },
                   children: [
                     /* @__PURE__ */ jsxRuntime.jsx(GanttToday, { ...ganttTodayProps }),
                     /* @__PURE__ */ jsxRuntime.jsx(
@@ -17697,9 +17752,13 @@
           toggleTask(taskId);
           return;
         }
-        selectTask(taskId);
+        if (selectedIdsMirror[taskId]) {
+          toggleTask(taskId);
+        } else {
+          selectTask(taskId);
+        }
       },
-      [selectTask, selectTasksFromLastSelected, toggleTask]
+      [selectTask, selectTasksFromLastSelected, toggleTask, selectedIdsMirror]
     );
     const cutTask = React.useCallback((task) => {
       setCutIdsMirror({
@@ -17729,7 +17788,9 @@
     );
     React.useEffect(() => {
       if (onSelectTaskIds) {
-        const selectedTaskIds = Object.keys(selectedIdsMirror).filter((x) => selectedIdsMirror[x]);
+        const selectedTaskIds = Object.keys(selectedIdsMirror).filter(
+          (x) => selectedIdsMirror[x]
+        );
         onSelectTaskIds(selectedTaskIds);
       }
     }, [onSelectTaskIds, selectedIdsMirror]);
@@ -17932,9 +17993,16 @@
         }
         const { top, left } = wrapperNode.getBoundingClientRect();
         setContextMenu({
-          task,
-          x: clientX - left,
-          y: clientY - top
+          task: null,
+          x: 0,
+          y: 0
+        });
+        requestAnimationFrame(() => {
+          setContextMenu({
+            task,
+            x: clientX - left,
+            y: clientY - top
+          });
         });
         if (task.type !== "empty") {
           scrollToTask(task);
@@ -18074,7 +18142,12 @@
       }
     }, [context, task, x, y]);
     const focus = useFocus(context);
-    const dismiss = useDismiss(context);
+    const dismiss = useDismiss(context, {
+      outsidePress: true,
+      outsidePressEvent: "mousedown",
+      ancestorScroll: true,
+      escapeKey: true
+    });
     const role = useRole(context, { role: "tooltip" });
     const { getReferenceProps, getFloatingProps } = useInteractions([
       focus,
@@ -19051,6 +19124,34 @@
       [mapTaskToCoordinates, setScrollXProgrammatically]
     );
     const { contextMenu, handleCloseContextMenu, handleOpenContextMenu } = useContextMenu(wrapperRef, scrollToTask);
+    const [ganttContextMenu, setGanttContextMenu] = React.useState({
+      task: null,
+      x: 0,
+      y: 0
+    });
+    const handleOpenGanttContextMenu = React.useCallback(
+      (task, clientX, clientY) => {
+        const wrapperNode = wrapperRef.current;
+        if (!wrapperNode) {
+          return;
+        }
+        const { top, left } = wrapperNode.getBoundingClientRect();
+        setGanttContextMenu({
+          task: task || { id: "__gantt_area__", type: "empty" },
+          // Use a dummy task for gantt area
+          x: clientX - left,
+          y: clientY - top
+        });
+      },
+      [wrapperRef]
+    );
+    const handleCloseGanttContextMenu = React.useCallback(() => {
+      setGanttContextMenu({
+        task: null,
+        x: 0,
+        y: 0
+      });
+    }, []);
     const [dependencyMap, dependentMap, dependencyMarginsMap] = React.useMemo(
       () => getDependencyMap(
         sortedTasks,
@@ -19839,6 +19940,12 @@
         createDeleteOption(locale)
       ];
     }, [taskList.contextMenuOptions, locale]);
+    const ganttContextMenuOptions = React.useMemo(() => {
+      if (taskBar.taskGanttContextMenuOption) {
+        return taskBar.taskGanttContextMenuOption;
+      }
+      return [createPasteOption(locale)];
+    }, [taskBar.taskGanttContextMenuOption, locale]);
     const tooltipTaskFromMap = React.useMemo(() => {
       if (!tooltipTask) {
         return null;
@@ -19882,7 +19989,6 @@
         rtl,
         startDate,
         viewMode,
-        taskHeight,
         showTodayLine,
         showDataDateLine,
         dataDate,
@@ -19899,7 +20005,6 @@
         rtl,
         startDate,
         viewMode,
-        taskHeight,
         showTodayLine,
         showDataDateLine,
         dataDate,
@@ -20109,7 +20214,10 @@
               horizontalContainerRef,
               verticalScrollbarRef,
               onVerticalScrollbarScrollX,
-              verticalGanttContainerRef
+              verticalGanttContainerRef,
+              onOpenGanttContextMenu: (clientX, clientY) => {
+                handleOpenGanttContextMenu(null, clientX, clientY);
+              }
             }
           ),
           tooltipTaskFromMap && /* @__PURE__ */ jsxRuntime.jsx(
@@ -20148,6 +20256,18 @@
               options: contextMenuOptions
             }
           ),
+          ganttContextMenu.task && !waitCommitTasks && /* @__PURE__ */ jsxRuntime.jsx(
+            ContextMenu,
+            {
+              checkHasCopyTasks,
+              checkHasCutTasks,
+              contextMenu: ganttContextMenu,
+              distances,
+              handleAction,
+              handleCloseContextMenu: handleCloseGanttContextMenu,
+              options: ganttContextMenuOptions
+            }
+          ),
           /* @__PURE__ */ jsxRuntime.jsx(GanttLoader, { loading: waitCommitTasks })
         ]
       }