gantt-task-react-v 1.6.3 → 1.6.5

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

@@ -20907,19 +20907,25 @@ const Gantt = (props) => {
   const handleTaskClick = useCallback(
     (task, _event) => {
       if (enableDrawer && drawerData) {
+        selectTask(task.id);
+        setActiveArrowKey(null);
+        setActiveTaskId(task.id);
+        setDrawerData({ type: "task", task });
+        if (taskBar.onClick) {
+          taskBar.onClick(task);
+        }
         return;
       }
+      setActiveArrowKey(null);
+      setActiveTaskId(task.id);
       if (taskBar.onClick) {
         taskBar.onClick(task);
       }
     },
-    [enableDrawer, drawerData, taskBar]
+    [enableDrawer, drawerData, selectTask, taskBar]
   );
   const handleTaskDoubleClick = useCallback(
     (task) => {
-      if (enableDrawer && drawerData) {
-        return;
-      }
       selectTask(task.id);
       if (enableDrawer) {
         setActiveArrowKey(null);
@@ -20930,7 +20936,7 @@ const Gantt = (props) => {
         taskBar.onDoubleClick(task);
       }
     },
-    [enableDrawer, drawerData, selectTask, taskBar]
+    [enableDrawer, selectTask, taskBar]
   );
   const handleTaskRowClick = useCallback(
     (task) => {
@@ -20997,6 +21003,13 @@ const Gantt = (props) => {
     setActiveArrowKey(null);
     setActiveTaskId(null);
   }, [drawerData, selectedIdsMirror, tasksMap]);
+  useEffect(() => {
+    const selectedIds = Object.keys(selectedIdsMirror);
+    if (selectedIds.length === 0) {
+      setActiveArrowKey(null);
+      setActiveTaskId(null);
+    }
+  }, [selectedIdsMirror]);
   const handleGoToTask = useCallback(
     (taskId) => {
       for (const [comparisonLevel, levelMap] of tasksMap) {
@@ -21227,41 +21240,16 @@ const Gantt = (props) => {
     (taskId, event) => {
       if (enableDrawer && drawerData) {
         selectTask(taskId);
-        setActiveArrowKey(null);
-        setActiveTaskId(taskId);
-        for (const [, levelMap] of tasksMap) {
-          const task = levelMap.get(taskId);
-          if (task && task.type !== "empty") {
-            setDrawerData({ type: "task", task });
-            break;
-          }
-        }
-        if (taskBar.onClick) {
-          for (const [, levelMap] of tasksMap) {
-            const task = levelMap.get(taskId);
-            if (task && task.type !== "empty") {
-              taskBar.onClick(task);
-              break;
-            }
-          }
-        }
         return;
       }
       selectTaskOnMouseDown(taskId, event);
     },
-    [
-      enableDrawer,
-      drawerData,
-      selectTask,
-      selectTaskOnMouseDown,
-      taskBar,
-      tasksMap
-    ]
+    [enableDrawer, drawerData, selectTask, selectTaskOnMouseDown]
   );
   const renderTaskBarProps = useMemo(
     () => ({
       ...taskBar,
-      onClick: enableDrawer ? handleTaskClick : taskBar.onClick,
+      onClick: handleTaskClick,
       onDoubleClick: enableDrawer ? handleTaskDoubleClick : taskBar.onDoubleClick,
       taskBarMovingAction: (task) => {
         var _a2;
@@ -21334,6 +21322,7 @@ const Gantt = (props) => {
       activeTaskId,
       enableDrawer,
       handleTaskClick,
+      handleTaskDoubleClick,
       renderedRowIndexes,
       rtl,
       drawerAwareSelectOnMouseDown,

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

@@ -20924,19 +20924,25 @@
     const handleTaskClick = React.useCallback(
       (task, _event) => {
         if (enableDrawer && drawerData) {
+          selectTask(task.id);
+          setActiveArrowKey(null);
+          setActiveTaskId(task.id);
+          setDrawerData({ type: "task", task });
+          if (taskBar.onClick) {
+            taskBar.onClick(task);
+          }
           return;
         }
+        setActiveArrowKey(null);
+        setActiveTaskId(task.id);
         if (taskBar.onClick) {
           taskBar.onClick(task);
         }
       },
-      [enableDrawer, drawerData, taskBar]
+      [enableDrawer, drawerData, selectTask, taskBar]
     );
     const handleTaskDoubleClick = React.useCallback(
       (task) => {
-        if (enableDrawer && drawerData) {
-          return;
-        }
         selectTask(task.id);
         if (enableDrawer) {
           setActiveArrowKey(null);
@@ -20947,7 +20953,7 @@
           taskBar.onDoubleClick(task);
         }
       },
-      [enableDrawer, drawerData, selectTask, taskBar]
+      [enableDrawer, selectTask, taskBar]
     );
     const handleTaskRowClick = React.useCallback(
       (task) => {
@@ -21014,6 +21020,13 @@
       setActiveArrowKey(null);
       setActiveTaskId(null);
     }, [drawerData, selectedIdsMirror, tasksMap]);
+    React.useEffect(() => {
+      const selectedIds = Object.keys(selectedIdsMirror);
+      if (selectedIds.length === 0) {
+        setActiveArrowKey(null);
+        setActiveTaskId(null);
+      }
+    }, [selectedIdsMirror]);
     const handleGoToTask = React.useCallback(
       (taskId) => {
         for (const [comparisonLevel, levelMap] of tasksMap) {
@@ -21244,41 +21257,16 @@
       (taskId, event) => {
         if (enableDrawer && drawerData) {
           selectTask(taskId);
-          setActiveArrowKey(null);
-          setActiveTaskId(taskId);
-          for (const [, levelMap] of tasksMap) {
-            const task = levelMap.get(taskId);
-            if (task && task.type !== "empty") {
-              setDrawerData({ type: "task", task });
-              break;
-            }
-          }
-          if (taskBar.onClick) {
-            for (const [, levelMap] of tasksMap) {
-              const task = levelMap.get(taskId);
-              if (task && task.type !== "empty") {
-                taskBar.onClick(task);
-                break;
-              }
-            }
-          }
           return;
         }
         selectTaskOnMouseDown(taskId, event);
       },
-      [
-        enableDrawer,
-        drawerData,
-        selectTask,
-        selectTaskOnMouseDown,
-        taskBar,
-        tasksMap
-      ]
+      [enableDrawer, drawerData, selectTask, selectTaskOnMouseDown]
     );
     const renderTaskBarProps = React.useMemo(
       () => ({
         ...taskBar,
-        onClick: enableDrawer ? handleTaskClick : taskBar.onClick,
+        onClick: handleTaskClick,
         onDoubleClick: enableDrawer ? handleTaskDoubleClick : taskBar.onDoubleClick,
         taskBarMovingAction: (task) => {
           var _a2;
@@ -21351,6 +21339,7 @@
         activeTaskId,
         enableDrawer,
         handleTaskClick,
+        handleTaskDoubleClick,
         renderedRowIndexes,
         rtl,
         drawerAwareSelectOnMouseDown,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gantt-task-react-v",
-  "version": "1.6.3",
+  "version": "1.6.5",
   "description": "Interactive Gantt Chart for React with TypeScript.",
   "author": "aguilanbon",
   "homepage": "https://github.com/aguilanbon/gantt-task-react-v",