@uipath/apollo-react 6.22.3 → 6.23.0

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

@@ -12,16 +12,16 @@ import { useStageNodeLabels } from "../useStageNodeLabels.js";
 import { DraggableTask } from "./DraggableTask.js";
 import { getContextMenuItems, getDivider } from "./StageNodeTaskUtilities.js";
 import { StageTaskDragOverlay } from "./StageTaskDragOverlay.js";
-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 = useStageNodeLabels();
-    const sequentialTaskIds = useMemo(()=>sequentialTasks.map(({ task })=>task.id), [
-        sequentialTasks
+    const sequentialTaskIds = useMemo(()=>sequentialTaskGroups.flat().map((task)=>task.id), [
+        sequentialTaskGroups
     ]);
-    const { activeDragId, activeSequentialTask, isActiveTaskParallel, projected, handleDragStart, handleDragMove, handleDragOver, handleDragEnd, handleDragCancel } = useStageTaskDragHandler({
-        sequentialTaskGroups,
-        sequentialTasks,
+    const { activeTask, isActiveTaskParallel, handleDragStart, handleDragMove, handleDragEnd, handleDragCancel } = useStageTaskDragHandler({
+        taskGroups: sequentialTaskGroups,
         onTaskReorder: handleReorderSequentialTasks
     });
     const handleTaskRegroup = useCallback((groupModificationType, groupIndex, taskIndex)=>{
@@ -96,6 +96,50 @@ const StageNodeSequentialTaskGroups = ({ props, sequentialTaskGroups, sequential
     }), useSensor(KeyboardSensor, {
         coordinateGetter: sortableKeyboardCoordinates
     }));
+    const taskList = /*#__PURE__*/ jsx(StageItemsList, {
+        "data-testid": `sequential-tasks-list-${id}`,
+        className: "nodrag nopan",
+        children: sequentialTaskGroups.map((taskGroup, groupIndex)=>{
+            const isParallel = taskGroup.length > 1;
+            return /*#__PURE__*/ jsxs(Row, {
+                gap: Spacing.SpacingS,
+                children: [
+                    isParallel && /*#__PURE__*/ jsx(StageParallelBracket, {}),
+                    /*#__PURE__*/ jsxs(StageTaskGroupContainer, {
+                        isParallel: isParallel,
+                        children: [
+                            isParallel && /*#__PURE__*/ jsx(StageParallelLabel, {
+                                children: /*#__PURE__*/ 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__*/ jsx(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__*/ jsxs(StageItemsSection, {
         children: [
@@ -103,66 +147,21 @@ const StageNodeSequentialTaskGroups = ({ props, sequentialTaskGroups, sequential
                 title: labels.sequentialTasks,
                 testId: `sequential-tasks-header-${id}`
             }),
-            /*#__PURE__*/ jsxs(DndContext, {
+            isDragDisabled ? taskList : /*#__PURE__*/ jsxs(DndContext, {
                 collisionDetection: closestCenter,
                 sensors: sensors,
                 onDragStart: handleDragStart,
                 onDragMove: handleDragMove,
-                onDragOver: handleDragOver,
                 onDragEnd: handleDragEnd,
                 onDragCancel: handleDragCancel,
                 children: [
                     /*#__PURE__*/ jsx(SortableContext, {
                         items: sequentialTaskIds,
                         strategy: verticalListSortingStrategy,
-                        children: /*#__PURE__*/ jsx(StageItemsList, {
-                            "data-testid": `sequential-tasks-list-${id}`,
-                            className: "nodrag nopan",
-                            children: sequentialTaskGroups.map((taskGroup, groupIndex)=>{
-                                const isParallel = taskGroup.length > 1;
-                                return /*#__PURE__*/ jsxs(Row, {
-                                    gap: Spacing.SpacingS,
-                                    children: [
-                                        isParallel && /*#__PURE__*/ jsx(StageParallelBracket, {}),
-                                        /*#__PURE__*/ jsxs(StageTaskGroupContainer, {
-                                            isParallel: isParallel,
-                                            children: [
-                                                isParallel && /*#__PURE__*/ jsx(StageParallelLabel, {
-                                                    children: /*#__PURE__*/ 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__*/ jsx(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__*/ jsx(StageTaskDragOverlay, {
-                        activeTask: activeSequentialTask?.task,
+                        activeTask: activeTask,
                         isActiveTaskParallel: isActiveTaskParallel,
                         taskWidthStyle: taskWidthStyle
                     })

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

@@ -121,6 +121,7 @@ const TaskPlayButton = /*#__PURE__*/ (0, external_react_namespaceObject.memo)(({
             size: "icon",
             "data-testid": `stage-task-play-${taskId}`,
             onClick: handlePlayClick,
+            onPointerDown: (e)=>e.stopPropagation(),
             onMouseDown: (e)=>e.stopPropagation(),
             onKeyDown: (e)=>e.stopPropagation(),
             "aria-label": triggerTaskLabel,

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

@@ -1 +1 @@
-{"version":3,"file":"TaskContent.d.ts","sourceRoot":"","sources":["../../../../../src/canvas/components/StageNode/tasks/TaskContent.tsx"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAuE5E,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,aAAa,CAAC;IACpB,aAAa,CAAC,EAAE,kBAAkB,CAAC;IACnC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CACnC;AAED,eAAO,MAAM,WAAW,yGAC6C,gBAAgB,6CAoKpF,CAAC"}
+{"version":3,"file":"TaskContent.d.ts","sourceRoot":"","sources":["../../../../../src/canvas/components/StageNode/tasks/TaskContent.tsx"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAyE5E,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,aAAa,CAAC;IACpB,aAAa,CAAC,EAAE,kBAAkB,CAAC;IACnC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CACnC;AAED,eAAO,MAAM,WAAW,yGAC6C,gBAAgB,6CAoKpF,CAAC"}

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

@@ -83,6 +83,7 @@ const TaskPlayButton = /*#__PURE__*/ memo(({ taskId, onTaskPlay })=>{
             size: "icon",
             "data-testid": `stage-task-play-${taskId}`,
             onClick: handlePlayClick,
+            onPointerDown: (e)=>e.stopPropagation(),
             onMouseDown: (e)=>e.stopPropagation(),
             onKeyDown: (e)=>e.stopPropagation(),
             "aria-label": triggerTaskLabel,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uipath/apollo-react",
-  "version": "6.22.3",
+  "version": "6.23.0",
   "description": "Apollo Design System - React component library with Material UI theming",
   "repository": {
     "type": "git",