@uipath/apollo-react 4.22.3 → 4.23.0-pr654.b595ac5

package/dist/canvas/utils/container.js

@@ -64,6 +64,39 @@ function container_getContainerFitGeometry() {
 function isContainerNodeManifest(manifest) {
     return manifest?.display.shape === 'container';
 }
+function getContainerResizeMinimums({ nodes, containerId, getContainerFitGeometry: resolveContainerFitGeometry = container_getContainerFitGeometry, getNodeDimensions: resolveNodeDimensions = container_getNodeDimensions, ignoredNodeTypes = [] }) {
+    const containerNode = nodes.find((node)=>node.id === containerId);
+    const geometry = containerNode ? resolveContainerFitGeometry(containerNode) : null;
+    if (!containerNode || !geometry) return {
+        leftWidth: DEFAULT_CONTAINER_MIN_WIDTH,
+        rightWidth: DEFAULT_CONTAINER_MIN_WIDTH,
+        topHeight: DEFAULT_CONTAINER_MIN_HEIGHT,
+        bottomHeight: DEFAULT_CONTAINER_MIN_HEIGHT
+    };
+    const currentSize = resolveNodeDimensions(containerNode);
+    const ignoredTypes = new Set(ignoredNodeTypes);
+    const padding = geometry.padding ?? {};
+    let minimumChildX = 1 / 0;
+    let minimumChildY = 1 / 0;
+    let rightRequiredWidth = geometry.minWidth;
+    let bottomRequiredHeight = geometry.minHeight;
+    for (const childNode of nodes){
+        if (childNode.id === PREVIEW_NODE_ID || childNode.hidden || childNode.parentId !== containerId || ignoredTypes.has(childNode.type ?? '')) continue;
+        const childSize = resolveNodeDimensions(childNode);
+        minimumChildX = Math.min(minimumChildX, childNode.position.x);
+        minimumChildY = Math.min(minimumChildY, childNode.position.y);
+        rightRequiredWidth = Math.max(rightRequiredWidth, childNode.position.x + childSize.width + (padding.right ?? 0));
+        bottomRequiredHeight = Math.max(bottomRequiredHeight, childNode.position.y + childSize.height + (padding.bottom ?? 0));
+    }
+    const leftRequiredWidth = Number.isFinite(minimumChildX) ? currentSize.width - minimumChildX + (padding.left ?? 0) : geometry.minWidth;
+    const topRequiredHeight = Number.isFinite(minimumChildY) ? currentSize.height - minimumChildY + (padding.top ?? 0) : geometry.minHeight;
+    return {
+        leftWidth: snapUpToGrid(Math.max(geometry.minWidth, leftRequiredWidth)),
+        rightWidth: snapUpToGrid(rightRequiredWidth),
+        topHeight: snapUpToGrid(Math.max(geometry.minHeight, topRequiredHeight)),
+        bottomHeight: snapUpToGrid(bottomRequiredHeight)
+    };
+}
 function getAncestorContainerIds(containerId, nodesById) {
     const ancestors = [];
     let parentId = nodesById.get(containerId)?.parentId;
@@ -308,7 +341,7 @@ function collectLinearDownstreamSiblings({ startNodeId, parentId, nodes, edges,
     }
     return collectedIds;
 }
-function resolveInsertPreview({ source, sourceHandleType, reactFlowInstance, isContainerNode, replacedEdge: exactReplacedEdge, getContainerSafeArea, previewNodeSize, gap, getNodeDimensions }) {
+function resolveInsertPreview({ source, sourceHandleType, reactFlowInstance, isContainerNode, allowedContainerId, replacedEdge: exactReplacedEdge, getContainerSafeArea, previewNodeSize, gap, getNodeDimensions }) {
     if ('source' !== sourceHandleType || !source.handleId) return null;
     const replacedEdge = exactReplacedEdge ?? getSingleOutgoingEdge(source.nodeId, source.handleId, reactFlowInstance.getEdges());
     if (!replacedEdge) return null;
@@ -318,6 +351,7 @@ function resolveInsertPreview({ source, sourceHandleType, reactFlowInstance, isC
     const nodes = reactFlowInstance.getNodes();
     const containerNode = getContainerNodeForEdge(sourceNode, targetNode, nodes);
     if (!containerNode) return null;
+    if (allowedContainerId && containerNode.id !== allowedContainerId) return null;
     if (isContainerNode && !isContainerNode(containerNode)) return null;
     const containerPlacement = getPreviewPlacement({
         sourceNode,
@@ -357,6 +391,7 @@ function resolveAppendPreview({ source, sourceHandleType, reactFlowInstance, ...
     if (outgoingEdges.length > 0) return null;
     const nodes = reactFlowInstance.getNodes();
     const containerNode = nodes.find((node)=>node.id === sourceNode.parentId);
+    if (options.allowedContainerId && containerNode.id !== options.allowedContainerId) return null;
     if (options.isContainerNode && !options.isContainerNode(containerNode)) return null;
     const continuationTarget = options.getContainerContinuationTarget?.({
         containerNode,
@@ -527,8 +562,21 @@ function pushSiblingsAfterContainerGrowth({ nodes, changes, getNodeDimensions, g
         shifted
     };
 }
-function fitContainersAndPushSiblings({ nodes, containerIds, getContainerFitGeometry, getNodeDimensions, ignoredNodeTypes, gap }) {
+function fitContainersAndPushSiblings({ nodes, containerIds, getContainerFitGeometry, getNodeDimensions, ignoredNodeTypes, gap, initialChanges = [] }) {
+    let changed = false;
+    let shifted = false;
     let nextNodes = nodes;
+    if (initialChanges.length > 0) {
+        const pushResult = pushSiblingsAfterContainerGrowth({
+            nodes: nextNodes,
+            changes: initialChanges,
+            getNodeDimensions,
+            gap
+        });
+        nextNodes = pushResult.nodes;
+        shifted = pushResult.shifted;
+        changed = pushResult.shifted;
+    }
     for(let iteration = 0; iteration < 10; iteration += 1){
         const fitResult = ensureContainersFitChildren(nextNodes, {
             containerIds,
@@ -539,6 +587,7 @@ function fitContainersAndPushSiblings({ nodes, containerIds, getContainerFitGeom
         });
         nextNodes = fitResult.nodes;
         if (0 === fitResult.changes.length) break;
+        changed = true;
         const pushResult = pushSiblingsAfterContainerGrowth({
             nodes: nextNodes,
             changes: fitResult.changes,
@@ -546,9 +595,54 @@ function fitContainersAndPushSiblings({ nodes, containerIds, getContainerFitGeom
             gap
         });
         nextNodes = pushResult.nodes;
+        shifted ||= pushResult.shifted;
+        changed ||= pushResult.shifted;
         if (!pushResult.shifted) break;
     }
-    return nextNodes;
+    return {
+        nodes: nextNodes,
+        changed,
+        shifted
+    };
+}
+function pushSiblingsAfterContainerResize({ nodes, containerId, previousSize, nextSize, getContainerFitGeometry: resolveContainerFitGeometry = container_getContainerFitGeometry, getNodeDimensions: resolveNodeDimensions = container_getNodeDimensions, ignoredNodeTypes, gap = CONTAINER_SEQUENCE_GAP_PX }) {
+    const containerNode = nodes.find((node)=>node.id === containerId);
+    if (!containerNode) return {
+        nodes,
+        changed: false,
+        shifted: false
+    };
+    const currentSize = resolveNodeDimensions(containerNode);
+    let changed = currentSize.width !== nextSize.width || currentSize.height !== nextSize.height;
+    let shifted = false;
+    let nextNodes = changed ? nodes.map((node)=>node.id === containerId ? withNodeDimensions(node, nextSize) : node) : nodes;
+    const resizedWidthDelta = nextSize.width - previousSize.width;
+    const resizedHeightDelta = nextSize.height - previousSize.height;
+    const result = fitContainersAndPushSiblings({
+        nodes: nextNodes,
+        containerIds: [
+            containerId
+        ],
+        getContainerFitGeometry: resolveContainerFitGeometry,
+        getNodeDimensions: resolveNodeDimensions,
+        ignoredNodeTypes,
+        gap,
+        initialChanges: resizedWidthDelta > 0 || resizedHeightDelta > 0 ? [
+            {
+                containerId,
+                previousSize,
+                nextSize
+            }
+        ] : []
+    });
+    nextNodes = result.nodes;
+    shifted = result.shifted;
+    changed ||= result.changed;
+    return {
+        nodes: nextNodes,
+        changed,
+        shifted
+    };
 }
 function getContainerPlacement(previewNode) {
     const placement = previewNode.data?.[PLACEMENT_DATA_KEY];
@@ -617,6 +711,6 @@ function placeContainerNode({ nodes, insertedNode, placement, safeArea, getConta
         getNodeDimensions: resolveNodeDimensions,
         ignoredNodeTypes,
         gap
-    });
+    }).nodes;
 }
-export { CONTAINER_FRAME_INSET_PX, CONTAINER_SEQUENCE_GAP_PX, DEFAULT_CONTAINER_HEIGHT, DEFAULT_CONTAINER_MIN_HEIGHT, DEFAULT_CONTAINER_MIN_WIDTH, DEFAULT_CONTAINER_WIDTH, collectLinearDownstreamSiblings, ensureContainersFitChildren, fitContainersAndPushSiblings, container_getContainerFitGeometry as getContainerFitGeometry, getContainerNodeForEdge, getContainerPlacement, container_getContainerSafeArea as getContainerSafeArea, container_getNodeDimensions as getNodeDimensions, isContainerNodeManifest, placeContainerNode, resolveContainerPreview };
+export { CONTAINER_FRAME_INSET_PX, CONTAINER_SEQUENCE_GAP_PX, DEFAULT_CONTAINER_HEIGHT, DEFAULT_CONTAINER_MIN_HEIGHT, DEFAULT_CONTAINER_MIN_WIDTH, DEFAULT_CONTAINER_WIDTH, collectLinearDownstreamSiblings, ensureContainersFitChildren, fitContainersAndPushSiblings, container_getContainerFitGeometry as getContainerFitGeometry, getContainerNodeForEdge, getContainerPlacement, getContainerResizeMinimums, container_getContainerSafeArea as getContainerSafeArea, container_getNodeDimensions as getNodeDimensions, isContainerNodeManifest, placeContainerNode, pushSiblingsAfterContainerResize, resolveContainerPreview };

package/dist/canvas/utils/icon-registry.cjs

@@ -111,6 +111,14 @@ function isValidUrl(input) {
     return 'http:' === url.protocol || 'https:' === url.protocol;
 }
 function getIcon(iconId) {
+    if (!iconId) {
+        const BoxIcon = external_lucide_react_namespaceObject.icons.Box;
+        return ({ w, h, color })=>/*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(BoxIcon, {
+                width: w ?? 24,
+                height: h ?? 24,
+                color: color
+            });
+    }
     if (isValidUrl(iconId)) return ({ w, h })=>/*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("img", {
             src: iconId,
             alt: "icon",

package/dist/canvas/utils/icon-registry.d.ts

@@ -4,7 +4,7 @@ export type IconComponent = (props: {
     h?: number;
     color?: string;
 }) => JSX.Element;
-export declare function getIcon(iconId: string): IconComponent;
+export declare function getIcon(iconId?: string): IconComponent;
 export interface CanvasIconProps {
     icon?: string;
     size?: number;

package/dist/canvas/utils/icon-registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"icon-registry.d.ts","sourceRoot":"","sources":["../../../src/canvas/utils/icon-registry.tsx"],"names":[],"mappings":"AASA,OAAO,EAAE,KAAK,GAAG,EAAiB,MAAM,OAAO,CAAC;AAGhD,MAAM,MAAM,aAAa,GAAG,CAAC,KAAK,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,KAAK,GAAG,CAAC,OAAO,CAAC;AAuD/F,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,CAkCrD;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAMD,eAAO,MAAM,UAAU,uDAIrB,CAAC;AAGH,eAAO,MAAM,QAAQ,uDAAa,CAAC"}
+{"version":3,"file":"icon-registry.d.ts","sourceRoot":"","sources":["../../../src/canvas/utils/icon-registry.tsx"],"names":[],"mappings":"AASA,OAAO,EAAE,KAAK,GAAG,EAAiB,MAAM,OAAO,CAAC;AAGhD,MAAM,MAAM,aAAa,GAAG,CAAC,KAAK,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,KAAK,GAAG,CAAC,OAAO,CAAC;AAsD/F,wBAAgB,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,aAAa,CAuCtD;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAMD,eAAO,MAAM,UAAU,uDAIrB,CAAC;AAGH,eAAO,MAAM,QAAQ,uDAAa,CAAC"}

package/dist/canvas/utils/icon-registry.js

@@ -81,6 +81,14 @@ function isValidUrl(input) {
     return 'http:' === url.protocol || 'https:' === url.protocol;
 }
 function getIcon(iconId) {
+    if (!iconId) {
+        const BoxIcon = icons.Box;
+        return ({ w, h, color })=>/*#__PURE__*/ jsx(BoxIcon, {
+                width: w ?? 24,
+                height: h ?? 24,
+                color: color
+            });
+    }
     if (isValidUrl(iconId)) return ({ w, h })=>/*#__PURE__*/ jsx("img", {
             src: iconId,
             alt: "icon",

package/dist/canvas/utils/manifest-resolver.cjs

@@ -32,7 +32,7 @@ __webpack_require__.d(__webpack_exports__, {
 const external_collapse_cjs_namespaceObject = require("./collapse.cjs");
 function resolveDisplay(manifestDisplay, context) {
     if (!manifestDisplay) return {
-        icon: 'circle-question-mark',
+        icon: '',
         shape: 'square',
         label: context?.display?.label || 'Unknown Node'
     };
@@ -46,6 +46,7 @@ function resolveDisplay(manifestDisplay, context) {
         ...context?.display,
         label: resolvedLabel,
         canvasLabel: context?.display?.canvasLabel ?? manifestDisplay.canvasLabel,
+        icon: context?.display?.icon ?? manifestDisplay.icon ?? '',
         shape: isCollapsed ? collapsedShape : expandedShape
     };
 }

package/dist/canvas/utils/manifest-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manifest-resolver.d.ts","sourceRoot":"","sources":["../../../src/canvas/utils/manifest-resolver.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,KAAK,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAC5F,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AACnF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAMrE,MAAM,WAAW,iBAAkB,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAEhE,OAAO,CAAC,EAAE,qBAAqB,CAAC;IAEhC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAEjC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAMD,MAAM,MAAM,eAAe,GAAG,qBAAqB,GAAG;IACpD,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,wBAAwB,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5C,CAAC;AAKF,MAAM,WAAW,cAAe,SAAQ,IAAI,CAAC,cAAc,EAAE,QAAQ,GAAG,SAAS,GAAG,UAAU,CAAC;IAE7F,EAAE,EAAE,MAAM,CAAC;IAEX,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,OAAO,EAAE,OAAO,CAAC;IAEjB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;CAC/C;AAKD,MAAM,WAAW,mBAAoB,SAAQ,IAAI,CAAC,mBAAmB,EAAE,SAAS,CAAC;IAE/E,OAAO,EAAE,cAAc,EAAE,CAAC;CAC3B;AAKD,UAAU,YAAY;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;IACvB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAkBD,wBAAgB,cAAc,CAC5B,eAAe,CAAC,EAAE,mBAAmB,EACrC,OAAO,CAAC,EAAE,iBAAiB,GAC1B,eAAe,CAwCjB;AA6BD,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,EACrC,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAmBT;AAiCD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,GAAG,MAAM,CAKhF;AAuCD,wBAAgB,cAAc,CAC5B,YAAY,EAAE,mBAAmB,EAAE,EACnC,OAAO,EAAE,iBAAiB,GACzB,mBAAmB,EAAE,CAmEvB"}
+{"version":3,"file":"manifest-resolver.d.ts","sourceRoot":"","sources":["../../../src/canvas/utils/manifest-resolver.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,KAAK,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAC5F,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AACnF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAMrE,MAAM,WAAW,iBAAkB,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAEhE,OAAO,CAAC,EAAE,qBAAqB,CAAC;IAEhC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAEjC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAUD,MAAM,MAAM,eAAe,GAAG,qBAAqB,GAAG;IACpD,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,wBAAwB,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5C,CAAC;AAKF,MAAM,WAAW,cAAe,SAAQ,IAAI,CAAC,cAAc,EAAE,QAAQ,GAAG,SAAS,GAAG,UAAU,CAAC;IAE7F,EAAE,EAAE,MAAM,CAAC;IAEX,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,OAAO,EAAE,OAAO,CAAC;IAEjB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;CAC/C;AAKD,MAAM,WAAW,mBAAoB,SAAQ,IAAI,CAAC,mBAAmB,EAAE,SAAS,CAAC;IAE/E,OAAO,EAAE,cAAc,EAAE,CAAC;CAC3B;AAKD,UAAU,YAAY;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;IACvB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAkBD,wBAAgB,cAAc,CAC5B,eAAe,CAAC,EAAE,mBAAmB,EACrC,OAAO,CAAC,EAAE,iBAAiB,GAC1B,eAAe,CAyCjB;AA6BD,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,EACrC,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAmBT;AAiCD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,GAAG,MAAM,CAKhF;AAuCD,wBAAgB,cAAc,CAC5B,YAAY,EAAE,mBAAmB,EAAE,EACnC,OAAO,EAAE,iBAAiB,GACzB,mBAAmB,EAAE,CAmEvB"}

package/dist/canvas/utils/manifest-resolver.js

@@ -1,7 +1,7 @@
 import { getCollapsedShape } from "./collapse.js";
 function resolveDisplay(manifestDisplay, context) {
     if (!manifestDisplay) return {
-        icon: 'circle-question-mark',
+        icon: '',
         shape: 'square',
         label: context?.display?.label || 'Unknown Node'
     };
@@ -15,6 +15,7 @@ function resolveDisplay(manifestDisplay, context) {
         ...context?.display,
         label: resolvedLabel,
         canvasLabel: context?.display?.canvasLabel ?? manifestDisplay.canvasLabel,
+        icon: context?.display?.icon ?? manifestDisplay.icon ?? '',
         shape: isCollapsed ? collapsedShape : expandedShape
     };
 }

package/package.json

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