@uipath/apollo-react 6.22.3 → 6.23.0

package/dist/canvas/components/StageNode/tasks/StageNodeAllTaskGroups.js

@@ -15,7 +15,7 @@ const StageNodeAllTaskGroupsInner = ({ props, isReadOnly, taskWidthStyle, taskSt
     const allTasks = useMemo(()=>stageDetails?.tasks || [], [
         stageDetails?.tasks
     ]);
-    const { sequentialTaskGroups, sequentialTasks, adhocTaskGroups, adhocTasks, eventDrivenTaskGroups, eventDrivenTasks } = useStageTasksByGroups(allTasks);
+    const { sequentialTaskGroups, adhocTaskGroups, eventDrivenTaskGroups } = useStageTasksByGroups(allTasks);
     const selectedTaskId = stageDetails?.selectedTaskId;
     const defaultContent = stageDetails?.defaultContent || (isReadOnly ? labels.noTasks : labels.addFirstTask);
     const handleReorderSequentialTasks = useCallback((newTasks)=>{
@@ -30,6 +30,28 @@ const StageNodeAllTaskGroupsInner = ({ props, isReadOnly, taskWidthStyle, taskSt
         eventDrivenTaskGroups,
         adhocTaskGroups
     ]);
+    const handleReorderEventDrivenTasks = useCallback((newTasks)=>{
+        onTaskReorder?.([
+            ...sequentialTaskGroups,
+            ...newTasks,
+            ...adhocTaskGroups
+        ]);
+    }, [
+        onTaskReorder,
+        sequentialTaskGroups,
+        adhocTaskGroups
+    ]);
+    const handleReorderAdhocTasks = useCallback((newTasks)=>{
+        onTaskReorder?.([
+            ...sequentialTaskGroups,
+            ...eventDrivenTaskGroups,
+            ...newTasks
+        ]);
+    }, [
+        onTaskReorder,
+        sequentialTaskGroups,
+        eventDrivenTaskGroups
+    ]);
     const handleTaskClick = useCallback((e, taskElementId)=>{
         e.stopPropagation();
         onTaskClick?.(taskElementId);
@@ -104,7 +126,6 @@ const StageNodeAllTaskGroupsInner = ({ props, isReadOnly, taskWidthStyle, taskSt
                 /*#__PURE__*/ jsx(StageNodeSequentialTaskGroups, {
                     props: props,
                     sequentialTaskGroups: sequentialTaskGroups,
-                    sequentialTasks: sequentialTasks,
                     isReadOnly: isReadOnly,
                     selectedTaskId: selectedTaskId,
                     taskWidthStyle: taskWidthStyle,
@@ -115,19 +136,23 @@ const StageNodeAllTaskGroupsInner = ({ props, isReadOnly, taskWidthStyle, taskSt
                 }),
                 /*#__PURE__*/ jsx(StageNodeEventDrivenTaskGroups, {
                     props: props,
-                    eventDrivenTasks: eventDrivenTasks,
+                    eventDrivenTaskGroups: eventDrivenTaskGroups,
                     isReadOnly: isReadOnly,
                     selectedTaskId: selectedTaskId,
+                    taskWidthStyle: taskWidthStyle,
                     handleTaskClick: handleTaskClick,
+                    handleReorderEventDrivenTasks: handleReorderEventDrivenTasks,
                     generateReplaceTaskMenuItemForTask: generateReplaceTaskMenuItemForTask,
                     generateDeleteTaskMenuItemForTask: generateDeleteTaskMenuItemForTask
                 }),
                 /*#__PURE__*/ jsx(StageNodeAdhocTaskGroups, {
                     props: props,
-                    adhocTasks: adhocTasks,
+                    adhocTaskGroups: adhocTaskGroups,
                     isReadOnly: isReadOnly,
                     selectedTaskId: selectedTaskId,
+                    taskWidthStyle: taskWidthStyle,
                     handleTaskClick: handleTaskClick,
+                    handleReorderAdhocTasks: handleReorderAdhocTasks,
                     generateReplaceTaskMenuItemForTask: generateReplaceTaskMenuItemForTask,
                     generateDeleteTaskMenuItemForTask: generateDeleteTaskMenuItemForTask
                 })

package/dist/canvas/components/StageNode/tasks/StageNodeEventDrivenTaskGroups.cjs

@@ -27,15 +27,40 @@ __webpack_require__.d(__webpack_exports__, {
     StageNodeEventDrivenTaskGroups: ()=>StageNodeEventDrivenTaskGroups
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
+const core_namespaceObject = require("@dnd-kit/core");
+const sortable_namespaceObject = require("@dnd-kit/sortable");
 const external_react_namespaceObject = require("react");
+const useStageTaskDragHandler_cjs_namespaceObject = require("../hooks/useStageTaskDragHandler.cjs");
 const external_StageNode_styles_cjs_namespaceObject = require("../StageNode.styles.cjs");
 const StageItemsHeaderTitle_cjs_namespaceObject = require("../shared/StageItemsHeaderTitle.cjs");
 const external_useStageNodeLabels_cjs_namespaceObject = require("../useStageNodeLabels.cjs");
 const external_EventDrivenTask_cjs_namespaceObject = require("./EventDrivenTask.cjs");
-const StageNodeEventDrivenTaskGroupsInner = ({ props, eventDrivenTasks, isReadOnly, selectedTaskId, handleTaskClick, generateReplaceTaskMenuItemForTask, generateDeleteTaskMenuItemForTask })=>{
-    const { id, execution, onTaskGroupModification, onReplaceTaskFromToolbox, loadingTaskIds, onTaskBreakpointToggle, getTaskContextMenuItems } = props;
+const external_SortableTaskRow_cjs_namespaceObject = require("./SortableTaskRow.cjs");
+const external_StageNodeTaskUtilities_cjs_namespaceObject = require("./StageNodeTaskUtilities.cjs");
+const external_StageTaskDragOverlay_cjs_namespaceObject = require("./StageTaskDragOverlay.cjs");
+const StageNodeEventDrivenTaskGroupsInner = ({ props, eventDrivenTaskGroups, isReadOnly, selectedTaskId, taskWidthStyle, handleTaskClick, handleReorderEventDrivenTasks, generateReplaceTaskMenuItemForTask, generateDeleteTaskMenuItemForTask })=>{
+    const { id, execution, onTaskGroupModification, onReplaceTaskFromToolbox, onTaskReorder, loadingTaskIds, onTaskBreakpointToggle, getTaskContextMenuItems } = props;
     const hasBuiltInTaskActions = !!(onReplaceTaskFromToolbox || onTaskGroupModification);
     const labels = (0, external_useStageNodeLabels_cjs_namespaceObject.useStageNodeLabels)();
+    const isDragDisabled = !onTaskReorder || isReadOnly;
+    const rows = (0, external_react_namespaceObject.useMemo)(()=>eventDrivenTaskGroups.flat(), [
+        eventDrivenTaskGroups
+    ]);
+    const rowIds = (0, external_react_namespaceObject.useMemo)(()=>rows.map((task)=>task.id), [
+        rows
+    ]);
+    const { activeTask, handleDragStart, handleDragEnd, handleDragCancel } = (0, useStageTaskDragHandler_cjs_namespaceObject.useStageTaskDragHandler)({
+        taskGroups: eventDrivenTaskGroups,
+        onTaskReorder: handleReorderEventDrivenTasks,
+        allowRegrouping: false
+    });
+    const sensors = (0, core_namespaceObject.useSensors)((0, core_namespaceObject.useSensor)(core_namespaceObject.PointerSensor, {
+        activationConstraint: {
+            distance: 3
+        }
+    }), (0, core_namespaceObject.useSensor)(core_namespaceObject.KeyboardSensor, {
+        coordinateGetter: sortable_namespaceObject.sortableKeyboardCoordinates
+    }));
     const getEventDrivenContextMenuItems = (0, external_react_namespaceObject.useCallback)((task)=>{
         const items = [];
         const replaceTaskMenuItem = generateReplaceTaskMenuItemForTask(task.id, false);
@@ -47,40 +72,67 @@ const StageNodeEventDrivenTaskGroupsInner = ({ props, eventDrivenTasks, isReadOn
         }) ?? [];
         items.push(...additionalMenuItems);
         const deleteTaskMenuItem = generateDeleteTaskMenuItemForTask(task.id);
-        if (deleteTaskMenuItem) items.push(deleteTaskMenuItem);
+        if (deleteTaskMenuItem) {
+            if (items.length) items.push((0, external_StageNodeTaskUtilities_cjs_namespaceObject.getDivider)());
+            items.push(deleteTaskMenuItem);
+        }
         return items;
     }, [
         generateReplaceTaskMenuItemForTask,
         getTaskContextMenuItems,
         generateDeleteTaskMenuItemForTask
     ]);
-    if (0 === eventDrivenTasks.length) return null;
+    const taskList = /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_StageNode_styles_cjs_namespaceObject.StageItemsList, {
+        "data-testid": `event-driven-tasks-list-${id}`,
+        className: isDragDisabled ? void 0 : 'nodrag nopan',
+        children: rows.map((task)=>{
+            const taskExecution = execution?.taskStatus?.[task.id];
+            const hasMenu = !isReadOnly && hasBuiltInTaskActions || (getTaskContextMenuItems?.({
+                task,
+                taskGroupType: 'event-driven',
+                isParallel: false
+            })?.length ?? 0) > 0;
+            const row = /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_EventDrivenTask_cjs_namespaceObject.EventDrivenTaskItem, {
+                task: task,
+                taskExecution: taskExecution,
+                isSelected: selectedTaskId === task.id,
+                onTaskClick: handleTaskClick,
+                isTaskLoading: loadingTaskIds?.has(task.id),
+                isReadOnly: isReadOnly,
+                onToggleBreakpoint: isReadOnly ? onTaskBreakpointToggle : void 0,
+                getContextMenuItems: hasMenu ? getEventDrivenContextMenuItems : void 0
+            }, task.id);
+            return isDragDisabled ? row : /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_SortableTaskRow_cjs_namespaceObject.SortableTaskRow, {
+                taskId: task.id,
+                children: row
+            }, task.id);
+        })
+    });
+    if (0 === rows.length) return null;
     return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsxs)(external_StageNode_styles_cjs_namespaceObject.StageItemsSection, {
         children: [
             /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(StageItemsHeaderTitle_cjs_namespaceObject.StageItemsHeaderTitle, {
                 title: labels.eventDrivenTasks,
                 testId: `event-driven-tasks-header-${id}`
             }),
-            /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_StageNode_styles_cjs_namespaceObject.StageItemsList, {
-                "data-testid": `event-driven-tasks-list-${id}`,
-                children: eventDrivenTasks.map(({ task })=>{
-                    const taskExecution = execution?.taskStatus?.[task.id];
-                    const hasMenu = !isReadOnly && hasBuiltInTaskActions || (getTaskContextMenuItems?.({
-                        task,
-                        taskGroupType: 'event-driven',
-                        isParallel: false
-                    })?.length ?? 0) > 0;
-                    return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_EventDrivenTask_cjs_namespaceObject.EventDrivenTaskItem, {
-                        task: task,
-                        taskExecution: taskExecution,
-                        isSelected: selectedTaskId === task.id,
-                        onTaskClick: handleTaskClick,
-                        isTaskLoading: loadingTaskIds?.has(task.id),
-                        isReadOnly: isReadOnly,
-                        onToggleBreakpoint: isReadOnly ? onTaskBreakpointToggle : void 0,
-                        getContextMenuItems: hasMenu ? getEventDrivenContextMenuItems : void 0
-                    }, task.id);
-                })
+            isDragDisabled ? taskList : /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsxs)(core_namespaceObject.DndContext, {
+                collisionDetection: core_namespaceObject.closestCenter,
+                sensors: sensors,
+                onDragStart: handleDragStart,
+                onDragEnd: handleDragEnd,
+                onDragCancel: handleDragCancel,
+                children: [
+                    /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(sortable_namespaceObject.SortableContext, {
+                        items: rowIds,
+                        strategy: sortable_namespaceObject.verticalListSortingStrategy,
+                        children: taskList
+                    }),
+                    /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_StageTaskDragOverlay_cjs_namespaceObject.StageTaskDragOverlay, {
+                        activeTask: activeTask,
+                        isActiveTaskParallel: false,
+                        taskWidthStyle: taskWidthStyle
+                    })
+                ]
             })
         ]
     });

package/dist/canvas/components/StageNode/tasks/StageNodeEventDrivenTaskGroups.d.ts

@@ -1,11 +1,14 @@
+import { type CSSProperties } from 'react';
 import type { NodeMenuItem } from '../../NodeContextMenu';
-import type { StageNodeProps, StageTaskGroup } from '../StageNode.types';
-export declare const StageNodeEventDrivenTaskGroups: import("react").MemoExoticComponent<({ props, eventDrivenTasks, isReadOnly, selectedTaskId, handleTaskClick, generateReplaceTaskMenuItemForTask, generateDeleteTaskMenuItemForTask, }: {
+import type { StageNodeProps, StageTaskItem } from '../StageNode.types';
+export declare const StageNodeEventDrivenTaskGroups: import("react").MemoExoticComponent<({ props, eventDrivenTaskGroups, isReadOnly, selectedTaskId, taskWidthStyle, handleTaskClick, handleReorderEventDrivenTasks, generateReplaceTaskMenuItemForTask, generateDeleteTaskMenuItemForTask, }: {
     props: StageNodeProps;
-    eventDrivenTasks: StageTaskGroup[];
+    eventDrivenTaskGroups: StageTaskItem[][];
     isReadOnly: boolean;
     selectedTaskId?: string;
+    taskWidthStyle?: CSSProperties;
     handleTaskClick: (e: React.MouseEvent, taskElementId: string) => void;
+    handleReorderEventDrivenTasks: (newTasks: StageTaskItem[][]) => void;
     generateReplaceTaskMenuItemForTask: (taskId: string, isParallel: boolean) => NodeMenuItem | undefined;
     generateDeleteTaskMenuItemForTask: (taskId: string) => NodeMenuItem | undefined;
 }) => import("react/jsx-runtime").JSX.Element | null>;

package/dist/canvas/components/StageNode/tasks/StageNodeEventDrivenTaskGroups.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StageNodeEventDrivenTaskGroups.d.ts","sourceRoot":"","sources":["../../../../../src/canvas/components/StageNode/tasks/StageNodeEventDrivenTaskGroups.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE1D,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAiB,MAAM,oBAAoB,CAAC;AAqGxF,eAAO,MAAM,8BAA8B,yLAxFxC;IACD,KAAK,EAAE,cAAc,CAAC;IACtB,gBAAgB,EAAE,cAAc,EAAE,CAAC;IACnC,UAAU,EAAE,OAAO,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,EAAE,aAAa,EAAE,MAAM,KAAK,IAAI,CAAC;IACtE,kCAAkC,EAAE,CAClC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,OAAO,KAChB,YAAY,GAAG,SAAS,CAAC;IAC9B,iCAAiC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,YAAY,GAAG,SAAS,CAAC;CACjF,oDA6EsF,CAAC"}
+{"version":3,"file":"StageNodeEventDrivenTaskGroups.d.ts","sourceRoot":"","sources":["../../../../../src/canvas/components/StageNode/tasks/StageNodeEventDrivenTaskGroups.tsx"],"names":[],"mappings":"AAaA,OAAO,EAAE,KAAK,aAAa,EAA8B,MAAM,OAAO,CAAC;AACvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAG1D,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAwKxE,eAAO,MAAM,8BAA8B,6OAtJxC;IACD,KAAK,EAAE,cAAc,CAAC;IACtB,qBAAqB,EAAE,aAAa,EAAE,EAAE,CAAC;IACzC,UAAU,EAAE,OAAO,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,aAAa,CAAC;IAC/B,eAAe,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,EAAE,aAAa,EAAE,MAAM,KAAK,IAAI,CAAC;IACtE,6BAA6B,EAAE,CAAC,QAAQ,EAAE,aAAa,EAAE,EAAE,KAAK,IAAI,CAAC;IACrE,kCAAkC,EAAE,CAClC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,OAAO,KAChB,YAAY,GAAG,SAAS,CAAC;IAC9B,iCAAiC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,YAAY,GAAG,SAAS,CAAC;CACjF,oDAyIsF,CAAC"}

package/dist/canvas/components/StageNode/tasks/StageNodeEventDrivenTaskGroups.js

@@ -1,13 +1,38 @@
 import { jsx, jsxs } from "react/jsx-runtime";
-import { memo, useCallback } from "react";
+import { DndContext, KeyboardSensor, PointerSensor, closestCenter, useSensor, useSensors } from "@dnd-kit/core";
+import { SortableContext, sortableKeyboardCoordinates, verticalListSortingStrategy } from "@dnd-kit/sortable";
+import { memo, useCallback, useMemo } from "react";
+import { useStageTaskDragHandler } from "../hooks/useStageTaskDragHandler.js";
 import { StageItemsList, StageItemsSection } from "../StageNode.styles.js";
 import { StageItemsHeaderTitle } from "../shared/StageItemsHeaderTitle.js";
 import { useStageNodeLabels } from "../useStageNodeLabels.js";
 import { EventDrivenTaskItem } from "./EventDrivenTask.js";
-const StageNodeEventDrivenTaskGroupsInner = ({ props, eventDrivenTasks, isReadOnly, selectedTaskId, handleTaskClick, generateReplaceTaskMenuItemForTask, generateDeleteTaskMenuItemForTask })=>{
-    const { id, execution, onTaskGroupModification, onReplaceTaskFromToolbox, loadingTaskIds, onTaskBreakpointToggle, getTaskContextMenuItems } = props;
+import { SortableTaskRow } from "./SortableTaskRow.js";
+import { getDivider } from "./StageNodeTaskUtilities.js";
+import { StageTaskDragOverlay } from "./StageTaskDragOverlay.js";
+const StageNodeEventDrivenTaskGroupsInner = ({ props, eventDrivenTaskGroups, isReadOnly, selectedTaskId, taskWidthStyle, handleTaskClick, handleReorderEventDrivenTasks, generateReplaceTaskMenuItemForTask, generateDeleteTaskMenuItemForTask })=>{
+    const { id, execution, onTaskGroupModification, onReplaceTaskFromToolbox, onTaskReorder, loadingTaskIds, onTaskBreakpointToggle, getTaskContextMenuItems } = props;
     const hasBuiltInTaskActions = !!(onReplaceTaskFromToolbox || onTaskGroupModification);
     const labels = useStageNodeLabels();
+    const isDragDisabled = !onTaskReorder || isReadOnly;
+    const rows = useMemo(()=>eventDrivenTaskGroups.flat(), [
+        eventDrivenTaskGroups
+    ]);
+    const rowIds = useMemo(()=>rows.map((task)=>task.id), [
+        rows
+    ]);
+    const { activeTask, handleDragStart, handleDragEnd, handleDragCancel } = useStageTaskDragHandler({
+        taskGroups: eventDrivenTaskGroups,
+        onTaskReorder: handleReorderEventDrivenTasks,
+        allowRegrouping: false
+    });
+    const sensors = useSensors(useSensor(PointerSensor, {
+        activationConstraint: {
+            distance: 3
+        }
+    }), useSensor(KeyboardSensor, {
+        coordinateGetter: sortableKeyboardCoordinates
+    }));
     const getEventDrivenContextMenuItems = useCallback((task)=>{
         const items = [];
         const replaceTaskMenuItem = generateReplaceTaskMenuItemForTask(task.id, false);
@@ -19,40 +44,67 @@ const StageNodeEventDrivenTaskGroupsInner = ({ props, eventDrivenTasks, isReadOn
         }) ?? [];
         items.push(...additionalMenuItems);
         const deleteTaskMenuItem = generateDeleteTaskMenuItemForTask(task.id);
-        if (deleteTaskMenuItem) items.push(deleteTaskMenuItem);
+        if (deleteTaskMenuItem) {
+            if (items.length) items.push(getDivider());
+            items.push(deleteTaskMenuItem);
+        }
         return items;
     }, [
         generateReplaceTaskMenuItemForTask,
         getTaskContextMenuItems,
         generateDeleteTaskMenuItemForTask
     ]);
-    if (0 === eventDrivenTasks.length) return null;
+    const taskList = /*#__PURE__*/ jsx(StageItemsList, {
+        "data-testid": `event-driven-tasks-list-${id}`,
+        className: isDragDisabled ? void 0 : 'nodrag nopan',
+        children: rows.map((task)=>{
+            const taskExecution = execution?.taskStatus?.[task.id];
+            const hasMenu = !isReadOnly && hasBuiltInTaskActions || (getTaskContextMenuItems?.({
+                task,
+                taskGroupType: 'event-driven',
+                isParallel: false
+            })?.length ?? 0) > 0;
+            const row = /*#__PURE__*/ jsx(EventDrivenTaskItem, {
+                task: task,
+                taskExecution: taskExecution,
+                isSelected: selectedTaskId === task.id,
+                onTaskClick: handleTaskClick,
+                isTaskLoading: loadingTaskIds?.has(task.id),
+                isReadOnly: isReadOnly,
+                onToggleBreakpoint: isReadOnly ? onTaskBreakpointToggle : void 0,
+                getContextMenuItems: hasMenu ? getEventDrivenContextMenuItems : void 0
+            }, task.id);
+            return isDragDisabled ? row : /*#__PURE__*/ jsx(SortableTaskRow, {
+                taskId: task.id,
+                children: row
+            }, task.id);
+        })
+    });
+    if (0 === rows.length) return null;
     return /*#__PURE__*/ jsxs(StageItemsSection, {
         children: [
             /*#__PURE__*/ jsx(StageItemsHeaderTitle, {
                 title: labels.eventDrivenTasks,
                 testId: `event-driven-tasks-header-${id}`
             }),
-            /*#__PURE__*/ jsx(StageItemsList, {
-                "data-testid": `event-driven-tasks-list-${id}`,
-                children: eventDrivenTasks.map(({ task })=>{
-                    const taskExecution = execution?.taskStatus?.[task.id];
-                    const hasMenu = !isReadOnly && hasBuiltInTaskActions || (getTaskContextMenuItems?.({
-                        task,
-                        taskGroupType: 'event-driven',
-                        isParallel: false
-                    })?.length ?? 0) > 0;
-                    return /*#__PURE__*/ jsx(EventDrivenTaskItem, {
-                        task: task,
-                        taskExecution: taskExecution,
-                        isSelected: selectedTaskId === task.id,
-                        onTaskClick: handleTaskClick,
-                        isTaskLoading: loadingTaskIds?.has(task.id),
-                        isReadOnly: isReadOnly,
-                        onToggleBreakpoint: isReadOnly ? onTaskBreakpointToggle : void 0,
-                        getContextMenuItems: hasMenu ? getEventDrivenContextMenuItems : void 0
-                    }, task.id);
-                })
+            isDragDisabled ? taskList : /*#__PURE__*/ jsxs(DndContext, {
+                collisionDetection: closestCenter,
+                sensors: sensors,
+                onDragStart: handleDragStart,
+                onDragEnd: handleDragEnd,
+                onDragCancel: handleDragCancel,
+                children: [
+                    /*#__PURE__*/ jsx(SortableContext, {
+                        items: rowIds,
+                        strategy: verticalListSortingStrategy,
+                        children: taskList
+                    }),
+                    /*#__PURE__*/ jsx(StageTaskDragOverlay, {
+                        activeTask: activeTask,
+                        isActiveTaskParallel: false,
+                        taskWidthStyle: taskWidthStyle
+                    })
+                ]
             })
         ]
     });

package/dist/canvas/components/StageNode/tasks/StageNodeSequentialTaskGroups.cjs

@@ -40,16 +40,16 @@ const external_useStageNodeLabels_cjs_namespaceObject = require("../useStageNode
 const external_DraggableTask_cjs_namespaceObject = require("./DraggableTask.cjs");
 const external_StageNodeTaskUtilities_cjs_namespaceObject = require("./StageNodeTaskUtilities.cjs");
 const external_StageTaskDragOverlay_cjs_namespaceObject = require("./StageTaskDragOverlay.cjs");
-const StageNodeSequentialTaskGroups = ({ props, sequentialTaskGroups, sequentialTasks, allTasks, isReadOnly, selectedTaskId, taskWidthStyle, handleTaskClick, handleReorderSequentialTasks, generateReplaceTaskMenuItemForTask })=>{
+const StageNodeSequentialTaskGroups = ({ props, sequentialTaskGroups, allTasks, isReadOnly, selectedTaskId, taskWidthStyle, handleTaskClick, handleReorderSequentialTasks, generateReplaceTaskMenuItemForTask })=>{
     const { id, execution, onTaskGroupModification, onReplaceTaskFromToolbox, onTaskReorder, hideParallelOptions, loadingTaskIds, onTaskBreakpointToggle, getTaskContextMenuItems } = props;
     const hasBuiltInTaskActions = !!(onReplaceTaskFromToolbox || onTaskGroupModification);
+    const isDragDisabled = !onTaskReorder || isReadOnly;
     const labels = (0, external_useStageNodeLabels_cjs_namespaceObject.useStageNodeLabels)();
-    const sequentialTaskIds = (0, external_react_namespaceObject.useMemo)(()=>sequentialTasks.map(({ task })=>task.id), [
-        sequentialTasks
+    const sequentialTaskIds = (0, external_react_namespaceObject.useMemo)(()=>sequentialTaskGroups.flat().map((task)=>task.id), [
+        sequentialTaskGroups
     ]);
-    const { activeDragId, activeSequentialTask, isActiveTaskParallel, projected, handleDragStart, handleDragMove, handleDragOver, handleDragEnd, handleDragCancel } = (0, useStageTaskDragHandler_cjs_namespaceObject.useStageTaskDragHandler)({
-        sequentialTaskGroups,
-        sequentialTasks,
+    const { activeTask, isActiveTaskParallel, handleDragStart, handleDragMove, handleDragEnd, handleDragCancel } = (0, useStageTaskDragHandler_cjs_namespaceObject.useStageTaskDragHandler)({
+        taskGroups: sequentialTaskGroups,
         onTaskReorder: handleReorderSequentialTasks
     });
     const handleTaskRegroup = (0, external_react_namespaceObject.useCallback)((groupModificationType, groupIndex, taskIndex)=>{
@@ -124,6 +124,50 @@ const StageNodeSequentialTaskGroups = ({ props, sequentialTaskGroups, sequential
     }), (0, core_namespaceObject.useSensor)(core_namespaceObject.KeyboardSensor, {
         coordinateGetter: sortable_namespaceObject.sortableKeyboardCoordinates
     }));
+    const taskList = /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_StageNode_styles_cjs_namespaceObject.StageItemsList, {
+        "data-testid": `sequential-tasks-list-${id}`,
+        className: "nodrag nopan",
+        children: sequentialTaskGroups.map((taskGroup, groupIndex)=>{
+            const isParallel = taskGroup.length > 1;
+            return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsxs)(index_cjs_namespaceObject.Row, {
+                gap: apollo_core_namespaceObject.Spacing.SpacingS,
+                children: [
+                    isParallel && /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_StageNode_styles_cjs_namespaceObject.StageParallelBracket, {}),
+                    /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsxs)(external_StageNode_styles_cjs_namespaceObject.StageTaskGroupContainer, {
+                        isParallel: isParallel,
+                        children: [
+                            isParallel && /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_StageNode_styles_cjs_namespaceObject.StageParallelLabel, {
+                                children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("span", {
+                                    className: "text-xs",
+                                    children: labels.parallel
+                                })
+                            }),
+                            taskGroup.map((task)=>{
+                                const taskExecution = execution?.taskStatus?.[task.id];
+                                const hasMenu = !isReadOnly && hasBuiltInTaskActions || (getTaskContextMenuItems?.({
+                                    task,
+                                    taskGroupType: 'sequential',
+                                    isParallel
+                                })?.length ?? 0) > 0;
+                                return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_DraggableTask_cjs_namespaceObject.DraggableTask, {
+                                    task: task,
+                                    taskExecution: taskExecution,
+                                    isSelected: selectedTaskId === task.id,
+                                    isParallel: isParallel,
+                                    onTaskClick: handleTaskClick,
+                                    isDragDisabled: isDragDisabled,
+                                    isTaskLoading: loadingTaskIds?.has(task.id),
+                                    isReadOnly: isReadOnly,
+                                    onToggleBreakpoint: isReadOnly ? onTaskBreakpointToggle : void 0,
+                                    getContextMenuItems: hasMenu ? buildContextMenuItems : void 0
+                                }, task.id);
+                            })
+                        ]
+                    })
+                ]
+            }, `group-${groupIndex}`);
+        })
+    });
     if (0 === sequentialTaskGroups.length) return null;
     return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsxs)(external_StageNode_styles_cjs_namespaceObject.StageItemsSection, {
         children: [
@@ -131,66 +175,21 @@ const StageNodeSequentialTaskGroups = ({ props, sequentialTaskGroups, sequential
                 title: labels.sequentialTasks,
                 testId: `sequential-tasks-header-${id}`
             }),
-            /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsxs)(core_namespaceObject.DndContext, {
+            isDragDisabled ? taskList : /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsxs)(core_namespaceObject.DndContext, {
                 collisionDetection: core_namespaceObject.closestCenter,
                 sensors: sensors,
                 onDragStart: handleDragStart,
                 onDragMove: handleDragMove,
-                onDragOver: handleDragOver,
                 onDragEnd: handleDragEnd,
                 onDragCancel: handleDragCancel,
                 children: [
                     /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(sortable_namespaceObject.SortableContext, {
                         items: sequentialTaskIds,
                         strategy: sortable_namespaceObject.verticalListSortingStrategy,
-                        children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_StageNode_styles_cjs_namespaceObject.StageItemsList, {
-                            "data-testid": `sequential-tasks-list-${id}`,
-                            className: "nodrag nopan",
-                            children: sequentialTaskGroups.map((taskGroup, groupIndex)=>{
-                                const isParallel = taskGroup.length > 1;
-                                return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsxs)(index_cjs_namespaceObject.Row, {
-                                    gap: apollo_core_namespaceObject.Spacing.SpacingS,
-                                    children: [
-                                        isParallel && /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_StageNode_styles_cjs_namespaceObject.StageParallelBracket, {}),
-                                        /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsxs)(external_StageNode_styles_cjs_namespaceObject.StageTaskGroupContainer, {
-                                            isParallel: isParallel,
-                                            children: [
-                                                isParallel && /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_StageNode_styles_cjs_namespaceObject.StageParallelLabel, {
-                                                    children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("span", {
-                                                        className: "text-xs",
-                                                        children: labels.parallel
-                                                    })
-                                                }),
-                                                taskGroup.map((task)=>{
-                                                    const taskExecution = execution?.taskStatus?.[task.id];
-                                                    const hasMenu = !isReadOnly && hasBuiltInTaskActions || (getTaskContextMenuItems?.({
-                                                        task,
-                                                        taskGroupType: 'sequential',
-                                                        isParallel
-                                                    })?.length ?? 0) > 0;
-                                                    return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_DraggableTask_cjs_namespaceObject.DraggableTask, {
-                                                        task: task,
-                                                        taskExecution: taskExecution,
-                                                        isSelected: selectedTaskId === task.id,
-                                                        isParallel: isParallel,
-                                                        onTaskClick: handleTaskClick,
-                                                        projectedDepth: task.id === activeDragId && projected ? projected.depth : void 0,
-                                                        isDragDisabled: !onTaskReorder || isReadOnly,
-                                                        isTaskLoading: loadingTaskIds?.has(task.id),
-                                                        isReadOnly: isReadOnly,
-                                                        onToggleBreakpoint: isReadOnly ? onTaskBreakpointToggle : void 0,
-                                                        getContextMenuItems: hasMenu ? buildContextMenuItems : void 0
-                                                    }, task.id);
-                                                })
-                                            ]
-                                        })
-                                    ]
-                                }, `group-${groupIndex}`);
-                            })
-                        })
+                        children: taskList
                     }),
                     /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_StageTaskDragOverlay_cjs_namespaceObject.StageTaskDragOverlay, {
-                        activeTask: activeSequentialTask?.task,
+                        activeTask: activeTask,
                         isActiveTaskParallel: isActiveTaskParallel,
                         taskWidthStyle: taskWidthStyle
                     })

package/dist/canvas/components/StageNode/tasks/StageNodeSequentialTaskGroups.d.ts

@@ -1,10 +1,9 @@
 import { type CSSProperties } from 'react';
 import type { NodeMenuItem } from '../../NodeContextMenu';
-import type { StageNodeProps, StageTaskGroup, StageTaskItem } from '../StageNode.types';
-export declare const StageNodeSequentialTaskGroups: ({ props, sequentialTaskGroups, sequentialTasks, allTasks, isReadOnly, selectedTaskId, taskWidthStyle, handleTaskClick, handleReorderSequentialTasks, generateReplaceTaskMenuItemForTask, }: {
+import type { StageNodeProps, StageTaskItem } from '../StageNode.types';
+export declare const StageNodeSequentialTaskGroups: ({ props, sequentialTaskGroups, allTasks, isReadOnly, selectedTaskId, taskWidthStyle, handleTaskClick, handleReorderSequentialTasks, generateReplaceTaskMenuItemForTask, }: {
     props: StageNodeProps;
     sequentialTaskGroups: StageTaskItem[][];
-    sequentialTasks: StageTaskGroup[];
     allTasks: StageTaskItem[][];
     isReadOnly: boolean;
     selectedTaskId?: string;

package/dist/canvas/components/StageNode/tasks/StageNodeSequentialTaskGroups.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StageNodeSequentialTaskGroups.d.ts","sourceRoot":"","sources":["../../../../../src/canvas/components/StageNode/tasks/StageNodeSequentialTaskGroups.tsx"],"names":[],"mappings":"AAeA,OAAO,EAAE,KAAK,aAAa,EAAwB,MAAM,OAAO,CAAC;AAMjE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAS1D,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAOxF,eAAO,MAAM,6BAA6B,GAAI,4LAW3C;IACD,KAAK,EAAE,cAAc,CAAC;IACtB,oBAAoB,EAAE,aAAa,EAAE,EAAE,CAAC;IACxC,eAAe,EAAE,cAAc,EAAE,CAAC;IAClC,QAAQ,EAAE,aAAa,EAAE,EAAE,CAAC;IAC5B,UAAU,EAAE,OAAO,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,aAAa,CAAC;IAC/B,eAAe,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,EAAE,aAAa,EAAE,MAAM,KAAK,IAAI,CAAC;IACtE,4BAA4B,EAAE,CAAC,QAAQ,EAAE,aAAa,EAAE,EAAE,KAAK,IAAI,CAAC;IACpE,kCAAkC,EAAE,CAClC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,OAAO,KAChB,YAAY,GAAG,SAAS,CAAC;CAC/B,mDAwNA,CAAC"}
+{"version":3,"file":"StageNodeSequentialTaskGroups.d.ts","sourceRoot":"","sources":["../../../../../src/canvas/components/StageNode/tasks/StageNodeSequentialTaskGroups.tsx"],"names":[],"mappings":"AAeA,OAAO,EAAE,KAAK,aAAa,EAAwB,MAAM,OAAO,CAAC;AAMjE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAS1D,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAOxE,eAAO,MAAM,6BAA6B,GAAI,2KAU3C;IACD,KAAK,EAAE,cAAc,CAAC;IACtB,oBAAoB,EAAE,aAAa,EAAE,EAAE,CAAC;IACxC,QAAQ,EAAE,aAAa,EAAE,EAAE,CAAC;IAC5B,UAAU,EAAE,OAAO,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,aAAa,CAAC;IAC/B,eAAe,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,EAAE,aAAa,EAAE,MAAM,KAAK,IAAI,CAAC;IACtE,4BAA4B,EAAE,CAAC,QAAQ,EAAE,aAAa,EAAE,EAAE,KAAK,IAAI,CAAC;IACpE,kCAAkC,EAAE,CAClC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,OAAO,KAChB,YAAY,GAAG,SAAS,CAAC;CAC/B,mDAyNA,CAAC"}