@uipath/apollo-react 6.22.2 → 6.23.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (45) hide show
  1. package/dist/canvas/components/StageNode/StageNode.styles.cjs +7 -0
  2. package/dist/canvas/components/StageNode/StageNode.styles.d.ts.map +1 -1
  3. package/dist/canvas/components/StageNode/StageNode.styles.js +7 -0
  4. package/dist/canvas/components/StageNode/StageNode.types.d.ts +0 -5
  5. package/dist/canvas/components/StageNode/StageNode.types.d.ts.map +1 -1
  6. package/dist/canvas/components/StageNode/hooks/useStageTaskDragHandler.cjs +28 -53
  7. package/dist/canvas/components/StageNode/hooks/useStageTaskDragHandler.d.ts +7 -10
  8. package/dist/canvas/components/StageNode/hooks/useStageTaskDragHandler.d.ts.map +1 -1
  9. package/dist/canvas/components/StageNode/hooks/useStageTaskDragHandler.js +29 -54
  10. package/dist/canvas/components/StageNode/hooks/useStageTasksByGroups.cjs +12 -39
  11. package/dist/canvas/components/StageNode/hooks/useStageTasksByGroups.d.ts +0 -15
  12. package/dist/canvas/components/StageNode/hooks/useStageTasksByGroups.d.ts.map +1 -1
  13. package/dist/canvas/components/StageNode/hooks/useStageTasksByGroups.js +12 -39
  14. package/dist/canvas/components/StageNode/tasks/DraggableTask.cjs +4 -47
  15. package/dist/canvas/components/StageNode/tasks/DraggableTask.d.ts +1 -1
  16. package/dist/canvas/components/StageNode/tasks/DraggableTask.d.ts.map +1 -1
  17. package/dist/canvas/components/StageNode/tasks/DraggableTask.js +6 -49
  18. package/dist/canvas/components/StageNode/tasks/DraggableTask.types.d.ts +0 -1
  19. package/dist/canvas/components/StageNode/tasks/DraggableTask.types.d.ts.map +1 -1
  20. package/dist/canvas/components/StageNode/tasks/SortableTaskRow.cjs +75 -0
  21. package/dist/canvas/components/StageNode/tasks/SortableTaskRow.d.ts +7 -0
  22. package/dist/canvas/components/StageNode/tasks/SortableTaskRow.d.ts.map +1 -0
  23. package/dist/canvas/components/StageNode/tasks/SortableTaskRow.js +41 -0
  24. package/dist/canvas/components/StageNode/tasks/StageNodeAdhocTaskGroups.cjs +77 -25
  25. package/dist/canvas/components/StageNode/tasks/StageNodeAdhocTaskGroups.d.ts +6 -3
  26. package/dist/canvas/components/StageNode/tasks/StageNodeAdhocTaskGroups.d.ts.map +1 -1
  27. package/dist/canvas/components/StageNode/tasks/StageNodeAdhocTaskGroups.js +78 -26
  28. package/dist/canvas/components/StageNode/tasks/StageNodeAllTaskGroups.cjs +29 -4
  29. package/dist/canvas/components/StageNode/tasks/StageNodeAllTaskGroups.d.ts.map +1 -1
  30. package/dist/canvas/components/StageNode/tasks/StageNodeAllTaskGroups.js +29 -4
  31. package/dist/canvas/components/StageNode/tasks/StageNodeEventDrivenTaskGroups.cjs +76 -24
  32. package/dist/canvas/components/StageNode/tasks/StageNodeEventDrivenTaskGroups.d.ts +6 -3
  33. package/dist/canvas/components/StageNode/tasks/StageNodeEventDrivenTaskGroups.d.ts.map +1 -1
  34. package/dist/canvas/components/StageNode/tasks/StageNodeEventDrivenTaskGroups.js +77 -25
  35. package/dist/canvas/components/StageNode/tasks/StageNodeSequentialTaskGroups.cjs +53 -54
  36. package/dist/canvas/components/StageNode/tasks/StageNodeSequentialTaskGroups.d.ts +2 -3
  37. package/dist/canvas/components/StageNode/tasks/StageNodeSequentialTaskGroups.d.ts.map +1 -1
  38. package/dist/canvas/components/StageNode/tasks/StageNodeSequentialTaskGroups.js +53 -54
  39. package/dist/canvas/components/StageNode/tasks/StageNodeTaskUtilities.cjs +5 -6
  40. package/dist/canvas/components/StageNode/tasks/StageNodeTaskUtilities.d.ts.map +1 -1
  41. package/dist/canvas/components/StageNode/tasks/StageNodeTaskUtilities.js +5 -6
  42. package/dist/canvas/components/StageNode/tasks/TaskContent.cjs +1 -0
  43. package/dist/canvas/components/StageNode/tasks/TaskContent.d.ts.map +1 -1
  44. package/dist/canvas/components/StageNode/tasks/TaskContent.js +1 -0
  45. package/package.json +3 -3
@@ -12,16 +12,16 @@ import { useStageNodeLabels } from "../useStageNodeLabels.js";
12
12
  import { DraggableTask } from "./DraggableTask.js";
13
13
  import { getContextMenuItems, getDivider } from "./StageNodeTaskUtilities.js";
14
14
  import { StageTaskDragOverlay } from "./StageTaskDragOverlay.js";
15
- const StageNodeSequentialTaskGroups = ({ props, sequentialTaskGroups, sequentialTasks, allTasks, isReadOnly, selectedTaskId, taskWidthStyle, handleTaskClick, handleReorderSequentialTasks, generateReplaceTaskMenuItemForTask })=>{
15
+ const StageNodeSequentialTaskGroups = ({ props, sequentialTaskGroups, allTasks, isReadOnly, selectedTaskId, taskWidthStyle, handleTaskClick, handleReorderSequentialTasks, generateReplaceTaskMenuItemForTask })=>{
16
16
  const { id, execution, onTaskGroupModification, onReplaceTaskFromToolbox, onTaskReorder, hideParallelOptions, loadingTaskIds, onTaskBreakpointToggle, getTaskContextMenuItems } = props;
17
17
  const hasBuiltInTaskActions = !!(onReplaceTaskFromToolbox || onTaskGroupModification);
18
+ const isDragDisabled = !onTaskReorder || isReadOnly;
18
19
  const labels = useStageNodeLabels();
19
- const sequentialTaskIds = useMemo(()=>sequentialTasks.map(({ task })=>task.id), [
20
- sequentialTasks
20
+ const sequentialTaskIds = useMemo(()=>sequentialTaskGroups.flat().map((task)=>task.id), [
21
+ sequentialTaskGroups
21
22
  ]);
22
- const { activeDragId, activeSequentialTask, isActiveTaskParallel, projected, handleDragStart, handleDragMove, handleDragOver, handleDragEnd, handleDragCancel } = useStageTaskDragHandler({
23
- sequentialTaskGroups,
24
- sequentialTasks,
23
+ const { activeTask, isActiveTaskParallel, handleDragStart, handleDragMove, handleDragEnd, handleDragCancel } = useStageTaskDragHandler({
24
+ taskGroups: sequentialTaskGroups,
25
25
  onTaskReorder: handleReorderSequentialTasks
26
26
  });
27
27
  const handleTaskRegroup = useCallback((groupModificationType, groupIndex, taskIndex)=>{
@@ -96,6 +96,50 @@ const StageNodeSequentialTaskGroups = ({ props, sequentialTaskGroups, sequential
96
96
  }), useSensor(KeyboardSensor, {
97
97
  coordinateGetter: sortableKeyboardCoordinates
98
98
  }));
99
+ const taskList = /*#__PURE__*/ jsx(StageItemsList, {
100
+ "data-testid": `sequential-tasks-list-${id}`,
101
+ className: "nodrag nopan",
102
+ children: sequentialTaskGroups.map((taskGroup, groupIndex)=>{
103
+ const isParallel = taskGroup.length > 1;
104
+ return /*#__PURE__*/ jsxs(Row, {
105
+ gap: Spacing.SpacingS,
106
+ children: [
107
+ isParallel && /*#__PURE__*/ jsx(StageParallelBracket, {}),
108
+ /*#__PURE__*/ jsxs(StageTaskGroupContainer, {
109
+ isParallel: isParallel,
110
+ children: [
111
+ isParallel && /*#__PURE__*/ jsx(StageParallelLabel, {
112
+ children: /*#__PURE__*/ jsx("span", {
113
+ className: "text-xs",
114
+ children: labels.parallel
115
+ })
116
+ }),
117
+ taskGroup.map((task)=>{
118
+ const taskExecution = execution?.taskStatus?.[task.id];
119
+ const hasMenu = !isReadOnly && hasBuiltInTaskActions || (getTaskContextMenuItems?.({
120
+ task,
121
+ taskGroupType: 'sequential',
122
+ isParallel
123
+ })?.length ?? 0) > 0;
124
+ return /*#__PURE__*/ jsx(DraggableTask, {
125
+ task: task,
126
+ taskExecution: taskExecution,
127
+ isSelected: selectedTaskId === task.id,
128
+ isParallel: isParallel,
129
+ onTaskClick: handleTaskClick,
130
+ isDragDisabled: isDragDisabled,
131
+ isTaskLoading: loadingTaskIds?.has(task.id),
132
+ isReadOnly: isReadOnly,
133
+ onToggleBreakpoint: isReadOnly ? onTaskBreakpointToggle : void 0,
134
+ getContextMenuItems: hasMenu ? buildContextMenuItems : void 0
135
+ }, task.id);
136
+ })
137
+ ]
138
+ })
139
+ ]
140
+ }, `group-${groupIndex}`);
141
+ })
142
+ });
99
143
  if (0 === sequentialTaskGroups.length) return null;
100
144
  return /*#__PURE__*/ jsxs(StageItemsSection, {
101
145
  children: [
@@ -103,66 +147,21 @@ const StageNodeSequentialTaskGroups = ({ props, sequentialTaskGroups, sequential
103
147
  title: labels.sequentialTasks,
104
148
  testId: `sequential-tasks-header-${id}`
105
149
  }),
106
- /*#__PURE__*/ jsxs(DndContext, {
150
+ isDragDisabled ? taskList : /*#__PURE__*/ jsxs(DndContext, {
107
151
  collisionDetection: closestCenter,
108
152
  sensors: sensors,
109
153
  onDragStart: handleDragStart,
110
154
  onDragMove: handleDragMove,
111
- onDragOver: handleDragOver,
112
155
  onDragEnd: handleDragEnd,
113
156
  onDragCancel: handleDragCancel,
114
157
  children: [
115
158
  /*#__PURE__*/ jsx(SortableContext, {
116
159
  items: sequentialTaskIds,
117
160
  strategy: verticalListSortingStrategy,
118
- children: /*#__PURE__*/ jsx(StageItemsList, {
119
- "data-testid": `sequential-tasks-list-${id}`,
120
- className: "nodrag nopan",
121
- children: sequentialTaskGroups.map((taskGroup, groupIndex)=>{
122
- const isParallel = taskGroup.length > 1;
123
- return /*#__PURE__*/ jsxs(Row, {
124
- gap: Spacing.SpacingS,
125
- children: [
126
- isParallel && /*#__PURE__*/ jsx(StageParallelBracket, {}),
127
- /*#__PURE__*/ jsxs(StageTaskGroupContainer, {
128
- isParallel: isParallel,
129
- children: [
130
- isParallel && /*#__PURE__*/ jsx(StageParallelLabel, {
131
- children: /*#__PURE__*/ jsx("span", {
132
- className: "text-xs",
133
- children: labels.parallel
134
- })
135
- }),
136
- taskGroup.map((task)=>{
137
- const taskExecution = execution?.taskStatus?.[task.id];
138
- const hasMenu = !isReadOnly && hasBuiltInTaskActions || (getTaskContextMenuItems?.({
139
- task,
140
- taskGroupType: 'sequential',
141
- isParallel
142
- })?.length ?? 0) > 0;
143
- return /*#__PURE__*/ jsx(DraggableTask, {
144
- task: task,
145
- taskExecution: taskExecution,
146
- isSelected: selectedTaskId === task.id,
147
- isParallel: isParallel,
148
- onTaskClick: handleTaskClick,
149
- projectedDepth: task.id === activeDragId && projected ? projected.depth : void 0,
150
- isDragDisabled: !onTaskReorder || isReadOnly,
151
- isTaskLoading: loadingTaskIds?.has(task.id),
152
- isReadOnly: isReadOnly,
153
- onToggleBreakpoint: isReadOnly ? onTaskBreakpointToggle : void 0,
154
- getContextMenuItems: hasMenu ? buildContextMenuItems : void 0
155
- }, task.id);
156
- })
157
- ]
158
- })
159
- ]
160
- }, `group-${groupIndex}`);
161
- })
162
- })
161
+ children: taskList
163
162
  }),
164
163
  /*#__PURE__*/ jsx(StageTaskDragOverlay, {
165
- activeTask: activeSequentialTask?.task,
164
+ activeTask: activeTask,
166
165
  isActiveTaskParallel: isActiveTaskParallel,
167
166
  taskWidthStyle: taskWidthStyle
168
167
  })
@@ -32,8 +32,8 @@ __webpack_require__.d(__webpack_exports__, {
32
32
  const GroupModificationUtils_cjs_namespaceObject = require("../../../utils/GroupModificationUtils.cjs");
33
33
  const getContextMenuItems = ({ isParallelGroup, groupIndex, tasksLength, groupIndexInAllTasks, taskIndexInAllTasks, isAboveParallel, isBelowParallel, reGroupTaskFunction, hideParallelOptions = false, labels })=>{
34
34
  const CONTEXT_MENU_ITEMS = {
35
- MOVE_UP: getMenuItem('move-up', labels.moveUp, ()=>reGroupTaskFunction(GroupModificationUtils_cjs_namespaceObject.GroupModificationType.TASK_GROUP_UP, groupIndexInAllTasks, taskIndexInAllTasks)),
36
- MOVE_DOWN: getMenuItem('move-down', labels.moveDown, ()=>reGroupTaskFunction(GroupModificationUtils_cjs_namespaceObject.GroupModificationType.TASK_GROUP_DOWN, groupIndexInAllTasks, taskIndexInAllTasks)),
35
+ MOVE_UP: getMenuItem('move-up', labels.moveUp, ()=>reGroupTaskFunction(GroupModificationUtils_cjs_namespaceObject.GroupModificationType.TASK_GROUP_UP, groupIndexInAllTasks, taskIndexInAllTasks), 0 === groupIndex),
36
+ MOVE_DOWN: getMenuItem('move-down', labels.moveDown, ()=>reGroupTaskFunction(GroupModificationUtils_cjs_namespaceObject.GroupModificationType.TASK_GROUP_DOWN, groupIndexInAllTasks, taskIndexInAllTasks), groupIndex === tasksLength - 1),
37
37
  UNGROUP_ALL: getMenuItem('ungroup', labels.ungroupParallelTasks, ()=>reGroupTaskFunction(GroupModificationUtils_cjs_namespaceObject.GroupModificationType.UNGROUP_ALL_TASKS, groupIndexInAllTasks, taskIndexInAllTasks)),
38
38
  SPLIT_TASK: getMenuItem('split', labels.removeFromParallelGroup, ()=>reGroupTaskFunction(GroupModificationUtils_cjs_namespaceObject.GroupModificationType.SPLIT_GROUP, groupIndexInAllTasks, taskIndexInAllTasks)),
39
39
  REMOVE_GROUP: getMenuItem('remove-group', labels.removeGroupFromStage, ()=>reGroupTaskFunction(GroupModificationUtils_cjs_namespaceObject.GroupModificationType.REMOVE_GROUP, groupIndexInAllTasks, taskIndexInAllTasks)),
@@ -45,15 +45,14 @@ const getContextMenuItems = ({ isParallelGroup, groupIndex, tasksLength, groupIn
45
45
  DIVIDER: getDivider()
46
46
  };
47
47
  const items = [];
48
- if (groupIndex > 0) items.push(CONTEXT_MENU_ITEMS.MOVE_UP);
49
- if (groupIndex < tasksLength - 1) items.push(CONTEXT_MENU_ITEMS.MOVE_DOWN);
50
- if (items.length) items.push(CONTEXT_MENU_ITEMS.DIVIDER);
48
+ items.push(CONTEXT_MENU_ITEMS.MOVE_UP, CONTEXT_MENU_ITEMS.MOVE_DOWN, CONTEXT_MENU_ITEMS.DIVIDER);
51
49
  if (isParallelGroup && !hideParallelOptions) items.push(CONTEXT_MENU_ITEMS.UNGROUP_ALL, CONTEXT_MENU_ITEMS.SPLIT_TASK, CONTEXT_MENU_ITEMS.DIVIDER, CONTEXT_MENU_ITEMS.REMOVE_GROUP, CONTEXT_MENU_ITEMS.REMOVE_TASK);
52
50
  else if (isParallelGroup || hideParallelOptions) items.push(CONTEXT_MENU_ITEMS.REMOVE_TASK);
53
51
  else {
52
+ const parallelOptionsStart = items.length;
54
53
  if (groupIndex > 0) items.push(isAboveParallel ? CONTEXT_MENU_ITEMS.ADD_TO_PARALLEL_GROUP_ABOVE : CONTEXT_MENU_ITEMS.CREATE_PARALLEL_GROUP_ABOVE);
55
54
  if (groupIndex < tasksLength - 1) items.push(isBelowParallel ? CONTEXT_MENU_ITEMS.ADD_TO_PARALLEL_GROUP_BELOW : CONTEXT_MENU_ITEMS.CREATE_PARALLEL_GROUP_BELOW);
56
- if (items.length) items.push(CONTEXT_MENU_ITEMS.DIVIDER);
55
+ if (items.length > parallelOptionsStart) items.push(CONTEXT_MENU_ITEMS.DIVIDER);
57
56
  items.push(CONTEXT_MENU_ITEMS.REMOVE_TASK);
58
57
  }
59
58
  return items;
@@ -1 +1 @@
1
- {"version":3,"file":"StageNodeTaskUtilities.d.ts","sourceRoot":"","sources":["../../../../../src/canvas/components/StageNode/tasks/StageNodeTaskUtilities.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAC9E,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE1E,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,uBAAuB,EAAE,MAAM,CAAC;IAChC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,gCAAgC,EAAE,MAAM,CAAC;IACzC,gCAAgC,EAAE,MAAM,CAAC;IACzC,2BAA2B,EAAE,MAAM,CAAC;IACpC,2BAA2B,EAAE,MAAM,CAAC;CACrC;AAED,eAAO,MAAM,mBAAmB,GAAI,8KAWjC;IACD,eAAe,EAAE,OAAO,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,eAAe,EAAE,OAAO,CAAC;IACzB,eAAe,EAAE,OAAO,CAAC;IACzB,mBAAmB,EAAE,CACnB,qBAAqB,EAAE,qBAAqB,EAC5C,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,KACd,IAAI,CAAC;IACV,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,MAAM,EAAE,sBAAsB,CAAC;CAChC,KAAG,YAAY,EA+Hf,CAAC;AAEF,wBAAgB,WAAW,CACzB,EAAE,EAAE,MAAM,YAAO,EACjB,KAAK,EAAE,MAAM,YAAU,EACvB,OAAO,EAAE,MAAM,IAAI,EACnB,UAAU,UAAQ,GACjB,YAAY,CAEd;AAED,eAAO,MAAM,UAAU,QAAO,YAI7B,CAAC;AAEF,MAAM,WAAW,mBAAmB;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,OAAO,EAAE,MAAM,GAAG,WAAW,CAAC;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAMD,eAAO,MAAM,kBAAkB,GAC7B,WAAW,YAAY,EAAE,GAAG,SAAS,EACrC,aAAa,CAAC,IAAI,EAAE,cAAc,KAAK,IAAI,KAC1C,mBAAmB,EAwBrB,CAAC"}
1
+ {"version":3,"file":"StageNodeTaskUtilities.d.ts","sourceRoot":"","sources":["../../../../../src/canvas/components/StageNode/tasks/StageNodeTaskUtilities.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAC9E,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE1E,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,uBAAuB,EAAE,MAAM,CAAC;IAChC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,gCAAgC,EAAE,MAAM,CAAC;IACzC,gCAAgC,EAAE,MAAM,CAAC;IACzC,2BAA2B,EAAE,MAAM,CAAC;IACpC,2BAA2B,EAAE,MAAM,CAAC;CACrC;AAED,eAAO,MAAM,mBAAmB,GAAI,8KAWjC;IACD,eAAe,EAAE,OAAO,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,eAAe,EAAE,OAAO,CAAC;IACzB,eAAe,EAAE,OAAO,CAAC;IACzB,mBAAmB,EAAE,CACnB,qBAAqB,EAAE,qBAAqB,EAC5C,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,KACd,IAAI,CAAC;IACV,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,MAAM,EAAE,sBAAsB,CAAC;CAChC,KAAG,YAAY,EA0If,CAAC;AAEF,wBAAgB,WAAW,CACzB,EAAE,EAAE,MAAM,YAAO,EACjB,KAAK,EAAE,MAAM,YAAU,EACvB,OAAO,EAAE,MAAM,IAAI,EACnB,UAAU,UAAQ,GACjB,YAAY,CAEd;AAED,eAAO,MAAM,UAAU,QAAO,YAI7B,CAAC;AAEF,MAAM,WAAW,mBAAmB;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,OAAO,EAAE,MAAM,GAAG,WAAW,CAAC;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAMD,eAAO,MAAM,kBAAkB,GAC7B,WAAW,YAAY,EAAE,GAAG,SAAS,EACrC,aAAa,CAAC,IAAI,EAAE,cAAc,KAAK,IAAI,KAC1C,mBAAmB,EAwBrB,CAAC"}
@@ -1,8 +1,8 @@
1
1
  import { GroupModificationType } from "../../../utils/GroupModificationUtils.js";
2
2
  const getContextMenuItems = ({ isParallelGroup, groupIndex, tasksLength, groupIndexInAllTasks, taskIndexInAllTasks, isAboveParallel, isBelowParallel, reGroupTaskFunction, hideParallelOptions = false, labels })=>{
3
3
  const CONTEXT_MENU_ITEMS = {
4
- MOVE_UP: getMenuItem('move-up', labels.moveUp, ()=>reGroupTaskFunction(GroupModificationType.TASK_GROUP_UP, groupIndexInAllTasks, taskIndexInAllTasks)),
5
- MOVE_DOWN: getMenuItem('move-down', labels.moveDown, ()=>reGroupTaskFunction(GroupModificationType.TASK_GROUP_DOWN, groupIndexInAllTasks, taskIndexInAllTasks)),
4
+ MOVE_UP: getMenuItem('move-up', labels.moveUp, ()=>reGroupTaskFunction(GroupModificationType.TASK_GROUP_UP, groupIndexInAllTasks, taskIndexInAllTasks), 0 === groupIndex),
5
+ MOVE_DOWN: getMenuItem('move-down', labels.moveDown, ()=>reGroupTaskFunction(GroupModificationType.TASK_GROUP_DOWN, groupIndexInAllTasks, taskIndexInAllTasks), groupIndex === tasksLength - 1),
6
6
  UNGROUP_ALL: getMenuItem('ungroup', labels.ungroupParallelTasks, ()=>reGroupTaskFunction(GroupModificationType.UNGROUP_ALL_TASKS, groupIndexInAllTasks, taskIndexInAllTasks)),
7
7
  SPLIT_TASK: getMenuItem('split', labels.removeFromParallelGroup, ()=>reGroupTaskFunction(GroupModificationType.SPLIT_GROUP, groupIndexInAllTasks, taskIndexInAllTasks)),
8
8
  REMOVE_GROUP: getMenuItem('remove-group', labels.removeGroupFromStage, ()=>reGroupTaskFunction(GroupModificationType.REMOVE_GROUP, groupIndexInAllTasks, taskIndexInAllTasks)),
@@ -14,15 +14,14 @@ const getContextMenuItems = ({ isParallelGroup, groupIndex, tasksLength, groupIn
14
14
  DIVIDER: getDivider()
15
15
  };
16
16
  const items = [];
17
- if (groupIndex > 0) items.push(CONTEXT_MENU_ITEMS.MOVE_UP);
18
- if (groupIndex < tasksLength - 1) items.push(CONTEXT_MENU_ITEMS.MOVE_DOWN);
19
- if (items.length) items.push(CONTEXT_MENU_ITEMS.DIVIDER);
17
+ items.push(CONTEXT_MENU_ITEMS.MOVE_UP, CONTEXT_MENU_ITEMS.MOVE_DOWN, CONTEXT_MENU_ITEMS.DIVIDER);
20
18
  if (isParallelGroup && !hideParallelOptions) items.push(CONTEXT_MENU_ITEMS.UNGROUP_ALL, CONTEXT_MENU_ITEMS.SPLIT_TASK, CONTEXT_MENU_ITEMS.DIVIDER, CONTEXT_MENU_ITEMS.REMOVE_GROUP, CONTEXT_MENU_ITEMS.REMOVE_TASK);
21
19
  else if (isParallelGroup || hideParallelOptions) items.push(CONTEXT_MENU_ITEMS.REMOVE_TASK);
22
20
  else {
21
+ const parallelOptionsStart = items.length;
23
22
  if (groupIndex > 0) items.push(isAboveParallel ? CONTEXT_MENU_ITEMS.ADD_TO_PARALLEL_GROUP_ABOVE : CONTEXT_MENU_ITEMS.CREATE_PARALLEL_GROUP_ABOVE);
24
23
  if (groupIndex < tasksLength - 1) items.push(isBelowParallel ? CONTEXT_MENU_ITEMS.ADD_TO_PARALLEL_GROUP_BELOW : CONTEXT_MENU_ITEMS.CREATE_PARALLEL_GROUP_BELOW);
25
- if (items.length) items.push(CONTEXT_MENU_ITEMS.DIVIDER);
24
+ if (items.length > parallelOptionsStart) items.push(CONTEXT_MENU_ITEMS.DIVIDER);
26
25
  items.push(CONTEXT_MENU_ITEMS.REMOVE_TASK);
27
26
  }
28
27
  return items;
@@ -121,6 +121,7 @@ const TaskPlayButton = /*#__PURE__*/ (0, external_react_namespaceObject.memo)(({
121
121
  size: "icon",
122
122
  "data-testid": `stage-task-play-${taskId}`,
123
123
  onClick: handlePlayClick,
124
+ onPointerDown: (e)=>e.stopPropagation(),
124
125
  onMouseDown: (e)=>e.stopPropagation(),
125
126
  onKeyDown: (e)=>e.stopPropagation(),
126
127
  "aria-label": triggerTaskLabel,
@@ -1 +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"}
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;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"}
@@ -83,6 +83,7 @@ const TaskPlayButton = /*#__PURE__*/ memo(({ taskId, onTaskPlay })=>{
83
83
  size: "icon",
84
84
  "data-testid": `stage-task-play-${taskId}`,
85
85
  onClick: handlePlayClick,
86
+ onPointerDown: (e)=>e.stopPropagation(),
86
87
  onMouseDown: (e)=>e.stopPropagation(),
87
88
  onKeyDown: (e)=>e.stopPropagation(),
88
89
  "aria-label": triggerTaskLabel,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@uipath/apollo-react",
3
- "version": "6.22.2",
3
+ "version": "6.23.0",
4
4
  "description": "Apollo Design System - React component library with Material UI theming",
5
5
  "repository": {
6
6
  "type": "git",
@@ -220,8 +220,8 @@
220
220
  "use-sync-external-store": "^1.2.0",
221
221
  "zod": "^4.3.5",
222
222
  "zustand": "^5.0.9",
223
- "@uipath/apollo-wind": "2.33.3",
224
- "@uipath/apollo-core": "5.12.1"
223
+ "@uipath/apollo-core": "5.12.1",
224
+ "@uipath/apollo-wind": "2.33.3"
225
225
  },
226
226
  "devDependencies": {
227
227
  "@lingui/cli": "^5.6.1",