gantt-task-react-v 1.5.19 → 1.5.20

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

@@ -20813,13 +20813,16 @@ const Gantt = (props) => {
       if (enableDrawer) {
         setActiveArrowKey(null);
         setActiveTaskId(task.id);
+        if ((drawerData == null ? void 0 : drawerData.type) === "task") {
+          setDrawerData({ type: "task", task });
+        }
       }
       selectTask(task.id);
       if (taskBar.onClick) {
         taskBar.onClick(task);
       }
     },
-    [enableDrawer, selectTask, taskBar]
+    [enableDrawer, drawerData, selectTask, taskBar]
   );
   const handleTaskDoubleClick = useCallback(
     (task) => {
@@ -20864,17 +20867,31 @@ const Gantt = (props) => {
     setActiveTaskId(null);
   }, []);
   useEffect(() => {
-    if (!drawerData)
+    if (!drawerData || drawerData.type !== "task")
       return;
-    if (drawerData.type === "task") {
-      const taskId = drawerData.task.id;
-      if (!selectedIdsMirror[taskId]) {
-        setDrawerData(null);
-        setActiveArrowKey(null);
-        setActiveTaskId(null);
+    const currentTaskId = drawerData.task.id;
+    if (selectedIdsMirror[currentTaskId])
+      return;
+    const selectedIds = Object.keys(selectedIdsMirror);
+    if (selectedIds.length === 0) {
+      setDrawerData(null);
+      setActiveArrowKey(null);
+      setActiveTaskId(null);
+      return;
+    }
+    const newTaskId = selectedIds[0];
+    for (const [, levelMap] of tasksMap) {
+      const task = levelMap.get(newTaskId);
+      if (task && task.type !== "empty") {
+        setActiveTaskId(newTaskId);
+        setDrawerData({ type: "task", task });
+        return;
       }
     }
-  }, [drawerData, selectedIdsMirror]);
+    setDrawerData(null);
+    setActiveArrowKey(null);
+    setActiveTaskId(null);
+  }, [drawerData, selectedIdsMirror, tasksMap]);
   const handleGoToTask = useCallback(
     (taskId) => {
       for (const [comparisonLevel, levelMap] of tasksMap) {

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

@@ -20830,13 +20830,16 @@
         if (enableDrawer) {
           setActiveArrowKey(null);
           setActiveTaskId(task.id);
+          if ((drawerData == null ? void 0 : drawerData.type) === "task") {
+            setDrawerData({ type: "task", task });
+          }
         }
         selectTask(task.id);
         if (taskBar.onClick) {
           taskBar.onClick(task);
         }
       },
-      [enableDrawer, selectTask, taskBar]
+      [enableDrawer, drawerData, selectTask, taskBar]
     );
     const handleTaskDoubleClick = React.useCallback(
       (task) => {
@@ -20881,17 +20884,31 @@
       setActiveTaskId(null);
     }, []);
     React.useEffect(() => {
-      if (!drawerData)
+      if (!drawerData || drawerData.type !== "task")
         return;
-      if (drawerData.type === "task") {
-        const taskId = drawerData.task.id;
-        if (!selectedIdsMirror[taskId]) {
-          setDrawerData(null);
-          setActiveArrowKey(null);
-          setActiveTaskId(null);
+      const currentTaskId = drawerData.task.id;
+      if (selectedIdsMirror[currentTaskId])
+        return;
+      const selectedIds = Object.keys(selectedIdsMirror);
+      if (selectedIds.length === 0) {
+        setDrawerData(null);
+        setActiveArrowKey(null);
+        setActiveTaskId(null);
+        return;
+      }
+      const newTaskId = selectedIds[0];
+      for (const [, levelMap] of tasksMap) {
+        const task = levelMap.get(newTaskId);
+        if (task && task.type !== "empty") {
+          setActiveTaskId(newTaskId);
+          setDrawerData({ type: "task", task });
+          return;
         }
       }
-    }, [drawerData, selectedIdsMirror]);
+      setDrawerData(null);
+      setActiveArrowKey(null);
+      setActiveTaskId(null);
+    }, [drawerData, selectedIdsMirror, tasksMap]);
     const handleGoToTask = React.useCallback(
       (taskId) => {
         for (const [comparisonLevel, levelMap] of tasksMap) {

package/package.json

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